From f14992c04047358dfc0c022481ab09f6a604a7cb Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Fri, 9 Dec 2022 14:10:57 +0100 Subject: [PATCH] gps now over spi --- .VSCodeCounter/2022-12-09_11-39-58/details.md | 99 ++++++++++++ .../2022-12-09_11-39-58/diff-details.md | 97 +++++++++++ .VSCodeCounter/2022-12-09_11-39-58/diff.csv | 84 ++++++++++ .VSCodeCounter/2022-12-09_11-39-58/diff.md | 61 +++++++ .VSCodeCounter/2022-12-09_11-39-58/diff.txt | 146 +++++++++++++++++ .../2022-12-09_11-39-58/results.csv | 86 ++++++++++ .../2022-12-09_11-39-58/results.json | 1 + .VSCodeCounter/2022-12-09_11-39-58/results.md | 64 ++++++++ .../2022-12-09_11-39-58/results.txt | 151 ++++++++++++++++++ doc/Notes and TODOs/SPIpushRawData.txt | 9 ++ doc/PinBelegungen.txt | 4 +- include/config.h | 2 +- include/networkConfig.h | 6 +- lib/Navigation/navigation.cpp | 126 +++++++++++---- lib/Navigation/navigation.h | 35 +--- lib/Navigation/navigationUtils.cpp | 40 ----- lib/Navigation/navigationUtils.h | 30 ---- lib/Navigation/route.h | 4 + lib/NtripClient/ntripClient.cpp | 67 +------- lib/NtripClient/ntripClient.h | 5 +- lib/Times/debugTimes.cpp | 19 ++- lib/Times/debugTimes.h | 5 +- src/SpecialMenus/GPS/menuGPS.cpp | 35 ++-- src/driveModi/driveManager.cpp | 5 +- src/driveModi/driveManager.h | 1 + src/main.cpp | 17 +- 26 files changed, 974 insertions(+), 225 deletions(-) create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/details.md create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/diff-details.md create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/diff.csv create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/diff.md create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/diff.txt create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/results.csv create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/results.json create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/results.md create mode 100644 .VSCodeCounter/2022-12-09_11-39-58/results.txt create mode 100644 doc/Notes and TODOs/SPIpushRawData.txt delete mode 100644 lib/Navigation/navigationUtils.cpp delete mode 100644 lib/Navigation/navigationUtils.h diff --git a/.VSCodeCounter/2022-12-09_11-39-58/details.md b/.VSCodeCounter/2022-12-09_11-39-58/details.md new file mode 100644 index 0000000..41c89f4 --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/details.md @@ -0,0 +1,99 @@ +# Details + +Date : 2022-12-09 11:39:58 + +Directory c:\\Users\\alex1\\git\\projektarbeit + +Total : 84 files, 4279 codes, 1998 comments, 1138 blanks, all 7415 lines + +[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md) + +## Files +| filename | language | code | comment | blank | total | +| :--- | :--- | ---: | ---: | ---: | ---: | +| [projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/details.md](/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/details.md) | Markdown | 60 | 0 | 6 | 66 | +| [projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff-details.md](/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff-details.md) | Markdown | 9 | 0 | 6 | 15 | +| [projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff.md](/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff.md) | Markdown | 12 | 0 | 7 | 19 | +| [projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.json](/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.json) | JSON | 1 | 0 | 0 | 1 | +| [projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.md](/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.md) | Markdown | 39 | 0 | 7 | 46 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/details.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/details.md) | Markdown | 71 | 0 | 6 | 77 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff-details.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff-details.md) | Markdown | 52 | 0 | 6 | 58 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff.md) | Markdown | 31 | 0 | 7 | 38 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.json](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.json) | JSON | 1 | 0 | 0 | 1 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.md) | Markdown | 44 | 0 | 7 | 51 | +| [projektarbeit/debugMqtt/hw1/main.py](/projektarbeit/debugMqtt/hw1/main.py) | Python | 14 | 2 | 10 | 26 | +| [projektarbeit/debugMqtt/hw1/main_debug.py](/projektarbeit/debugMqtt/hw1/main_debug.py) | Python | 12 | 2 | 10 | 24 | +| [projektarbeit/debugMqtt/rhede/main.py](/projektarbeit/debugMqtt/rhede/main.py) | Python | 16 | 2 | 10 | 28 | +| [projektarbeit/debugMqtt/rhede/main_debug.py](/projektarbeit/debugMqtt/rhede/main_debug.py) | Python | 13 | 2 | 10 | 25 | +| [projektarbeit/doc/Diagrams/classdiagramm.uxf](/projektarbeit/doc/Diagrams/classdiagramm.uxf) | umlet | 142 | 0 | 15 | 157 | +| [projektarbeit/doc/Diagrams/statesAutopilot.uxf](/projektarbeit/doc/Diagrams/statesAutopilot.uxf) | umlet | 389 | 0 | 2 | 391 | +| [projektarbeit/include/config.h](/projektarbeit/include/config.h) | C++ | 5 | 15 | 2 | 22 | +| [projektarbeit/include/moveControl.h](/projektarbeit/include/moveControl.h) | C++ | 54 | 102 | 23 | 179 | +| [projektarbeit/include/moveControlConfig.h](/projektarbeit/include/moveControlConfig.h) | C++ | 23 | 18 | 4 | 45 | +| [projektarbeit/include/network.h](/projektarbeit/include/network.h) | C++ | 25 | 56 | 14 | 95 | +| [projektarbeit/include/networkConfig.h](/projektarbeit/include/networkConfig.h) | C++ | 97 | 37 | 17 | 151 | +| [projektarbeit/lib/Battery/battery.cpp](/projektarbeit/lib/Battery/battery.cpp) | C++ | 45 | 11 | 10 | 66 | +| [projektarbeit/lib/Battery/battery.h](/projektarbeit/lib/Battery/battery.h) | C++ | 33 | 52 | 13 | 98 | +| [projektarbeit/lib/Illumination/underfloorLighting.cpp](/projektarbeit/lib/Illumination/underfloorLighting.cpp) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/lib/Illumination/underfloorLighting.h](/projektarbeit/lib/Illumination/underfloorLighting.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/lib/MQTT/debugMqtt.cpp](/projektarbeit/lib/MQTT/debugMqtt.cpp) | C++ | 81 | 12 | 17 | 110 | +| [projektarbeit/lib/MQTT/debugMqtt.h](/projektarbeit/lib/MQTT/debugMqtt.h) | C++ | 41 | 120 | 18 | 179 | +| [projektarbeit/lib/Menu/menu.cpp](/projektarbeit/lib/Menu/menu.cpp) | C++ | 106 | 11 | 19 | 136 | +| [projektarbeit/lib/Menu/menu.h](/projektarbeit/lib/Menu/menu.h) | C++ | 26 | 18 | 12 | 56 | +| [projektarbeit/lib/Menu/menuAction.cpp](/projektarbeit/lib/Menu/menuAction.cpp) | C++ | 36 | 10 | 9 | 55 | +| [projektarbeit/lib/Menu/menuAction.h](/projektarbeit/lib/Menu/menuAction.h) | C++ | 21 | 53 | 15 | 89 | +| [projektarbeit/lib/Menu/menuControl.h](/projektarbeit/lib/Menu/menuControl.h) | C++ | 22 | 44 | 10 | 76 | +| [projektarbeit/lib/Menu/menuIntInput.cpp](/projektarbeit/lib/Menu/menuIntInput.cpp) | C++ | 170 | 14 | 41 | 225 | +| [projektarbeit/lib/Menu/menuIntInput.h](/projektarbeit/lib/Menu/menuIntInput.h) | C++ | 46 | 34 | 20 | 100 | +| [projektarbeit/lib/MotorControl/motorControl.cpp](/projektarbeit/lib/MotorControl/motorControl.cpp) | C++ | 144 | 24 | 35 | 203 | +| [projektarbeit/lib/MotorControl/motorControl.h](/projektarbeit/lib/MotorControl/motorControl.h) | C++ | 47 | 102 | 22 | 171 | +| [projektarbeit/lib/Navigation/navigation.cpp](/projektarbeit/lib/Navigation/navigation.cpp) | C++ | 178 | 28 | 40 | 246 | +| [projektarbeit/lib/Navigation/navigation.h](/projektarbeit/lib/Navigation/navigation.h) | C++ | 53 | 119 | 29 | 201 | +| [projektarbeit/lib/Navigation/route.cpp](/projektarbeit/lib/Navigation/route.cpp) | C++ | 28 | 10 | 8 | 46 | +| [projektarbeit/lib/Navigation/route.h](/projektarbeit/lib/Navigation/route.h) | C++ | 34 | 74 | 20 | 128 | +| [projektarbeit/lib/NtripClient/ntripClient.cpp](/projektarbeit/lib/NtripClient/ntripClient.cpp) | C++ | 186 | 22 | 42 | 250 | +| [projektarbeit/lib/NtripClient/ntripClient.h](/projektarbeit/lib/NtripClient/ntripClient.h) | C++ | 50 | 0 | 16 | 66 | +| [projektarbeit/lib/Speedometer/speedometer.cpp](/projektarbeit/lib/Speedometer/speedometer.cpp) | C++ | 81 | 12 | 21 | 114 | +| [projektarbeit/lib/Speedometer/speedometer.h](/projektarbeit/lib/Speedometer/speedometer.h) | C++ | 35 | 68 | 22 | 125 | +| [projektarbeit/lib/Times/debugTimes.cpp](/projektarbeit/lib/Times/debugTimes.cpp) | C++ | 28 | 10 | 9 | 47 | +| [projektarbeit/lib/Times/debugTimes.h](/projektarbeit/lib/Times/debugTimes.h) | C++ | 19 | 40 | 13 | 72 | +| [projektarbeit/platformio.ini](/projektarbeit/platformio.ini) | Ini | 19 | 9 | 3 | 31 | +| [projektarbeit/src/OutputBuf/outputBuf.cpp](/projektarbeit/src/OutputBuf/outputBuf.cpp) | C++ | 36 | 11 | 13 | 60 | +| [projektarbeit/src/OutputBuf/outputBuf.h](/projektarbeit/src/OutputBuf/outputBuf.h) | C++ | 24 | 32 | 12 | 68 | +| [projektarbeit/src/SpecialMenus/Akku/menuAkku.cpp](/projektarbeit/src/SpecialMenus/Akku/menuAkku.cpp) | C++ | 48 | 10 | 12 | 70 | +| [projektarbeit/src/SpecialMenus/Akku/menuAkku.h](/projektarbeit/src/SpecialMenus/Akku/menuAkku.h) | C++ | 22 | 31 | 12 | 65 | +| [projektarbeit/src/SpecialMenus/GPS/menuGPS.cpp](/projektarbeit/src/SpecialMenus/GPS/menuGPS.cpp) | C++ | 159 | 10 | 23 | 192 | +| [projektarbeit/src/SpecialMenus/GPS/menuGPS.h](/projektarbeit/src/SpecialMenus/GPS/menuGPS.h) | C++ | 28 | 47 | 18 | 93 | +| [projektarbeit/src/SpecialMenus/PID/menuPidSettings.cpp](/projektarbeit/src/SpecialMenus/PID/menuPidSettings.cpp) | C++ | 65 | 10 | 19 | 94 | +| [projektarbeit/src/SpecialMenus/PID/menuPidSettings.h](/projektarbeit/src/SpecialMenus/PID/menuPidSettings.h) | C++ | 23 | 43 | 16 | 82 | +| [projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp](/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp) | C++ | 69 | 11 | 14 | 94 | +| [projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h](/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h) | C++ | 16 | 31 | 10 | 57 | +| [projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp](/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp) | C++ | 25 | 10 | 6 | 41 | +| [projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h](/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h) | C++ | 14 | 31 | 8 | 53 | +| [projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp](/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp) | C++ | 12 | 10 | 3 | 25 | +| [projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h](/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h) | C++ | 9 | 27 | 6 | 42 | +| [projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp](/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp) | C++ | 115 | 23 | 29 | 167 | +| [projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.h](/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.h) | C++ | 37 | 10 | 11 | 58 | +| [projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.cpp](/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.cpp) | C++ | 13 | 10 | 5 | 28 | +| [projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.h](/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.h) | C++ | 20 | 22 | 8 | 50 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilot.cpp](/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.cpp) | C++ | 73 | 11 | 20 | 104 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilot.h](/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.h) | C++ | 34 | 82 | 19 | 135 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilotConfig.h](/projektarbeit/src/driveModi/Modi/Autopilot/autopilotConfig.h) | C++ | 9 | 36 | 10 | 55 | +| [projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.cpp](/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.cpp) | C++ | 29 | 10 | 7 | 46 | +| [projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.h](/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.h) | C++ | 21 | 51 | 13 | 85 | +| [projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.cpp](/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.cpp) | C++ | 1 | 10 | 3 | 14 | +| [projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.h](/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.h) | C++ | 6 | 10 | 5 | 21 | +| [projektarbeit/src/driveModi/Modi/ManualControl/manualControl.cpp](/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.cpp) | C++ | 25 | 10 | 7 | 42 | +| [projektarbeit/src/driveModi/Modi/ManualControl/manualControl.h](/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.h) | C++ | 22 | 49 | 12 | 83 | +| [projektarbeit/src/driveModi/Modi/Racing/racing.cpp](/projektarbeit/src/driveModi/Modi/Racing/racing.cpp) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/src/driveModi/Modi/Racing/racing.h](/projektarbeit/src/driveModi/Modi/Racing/racing.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/src/driveModi/Modi/TestMode/testMode.cpp](/projektarbeit/src/driveModi/Modi/TestMode/testMode.cpp) | C++ | 99 | 14 | 28 | 141 | +| [projektarbeit/src/driveModi/Modi/TestMode/testMode.h](/projektarbeit/src/driveModi/Modi/TestMode/testMode.h) | C++ | 26 | 10 | 14 | 50 | +| [projektarbeit/src/driveModi/driveManager.cpp](/projektarbeit/src/driveModi/driveManager.cpp) | C++ | 63 | 13 | 21 | 97 | +| [projektarbeit/src/driveModi/driveManager.h](/projektarbeit/src/driveModi/driveManager.h) | C++ | 41 | 69 | 17 | 127 | +| [projektarbeit/src/driveModi/driveModi.h](/projektarbeit/src/driveModi/driveModi.h) | C++ | 10 | 22 | 6 | 38 | +| [projektarbeit/src/main.cpp](/projektarbeit/src/main.cpp) | C++ | 227 | 38 | 43 | 308 | +| [projektarbeit/src/moveControl.cpp](/projektarbeit/src/moveControl.cpp) | C++ | 133 | 35 | 34 | 202 | +| [projektarbeit/src/network.cpp](/projektarbeit/src/network.cpp) | C++ | 86 | 16 | 17 | 119 | + +[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/diff-details.md b/.VSCodeCounter/2022-12-09_11-39-58/diff-details.md new file mode 100644 index 0000000..506f22b --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/diff-details.md @@ -0,0 +1,97 @@ +# Diff Details + +Date : 2022-12-09 11:39:58 + +Directory c:\\Users\\alex1\\git\\projektarbeit + +Total : 82 files, 1960 codes, 1125 comments, 581 blanks, all 3666 lines + +[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details + +## Files +| filename | language | code | comment | blank | total | +| :--- | :--- | ---: | ---: | ---: | ---: | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/details.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/details.md) | Markdown | 71 | 0 | 6 | 77 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff-details.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff-details.md) | Markdown | 52 | 0 | 6 | 58 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff.md) | Markdown | 31 | 0 | 7 | 38 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.json](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.json) | JSON | 1 | 0 | 0 | 1 | +| [projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.md](/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.md) | Markdown | 44 | 0 | 7 | 51 | +| [projektarbeit/debugMqtt/hw1/main.py](/projektarbeit/debugMqtt/hw1/main.py) | Python | -1 | 0 | 0 | -1 | +| [projektarbeit/doc/Diagrams/classdiagramm.uxf](/projektarbeit/doc/Diagrams/classdiagramm.uxf) | umlet | 47 | 0 | 15 | 62 | +| [projektarbeit/include/config.h](/projektarbeit/include/config.h) | C++ | 4 | 14 | 1 | 19 | +| [projektarbeit/include/moveControl.h](/projektarbeit/include/moveControl.h) | C++ | 10 | -2 | 2 | 10 | +| [projektarbeit/include/moveControlConfig.h](/projektarbeit/include/moveControlConfig.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/include/network.h](/projektarbeit/include/network.h) | C++ | 2 | 46 | 5 | 53 | +| [projektarbeit/include/networkConfig.h](/projektarbeit/include/networkConfig.h) | C++ | 53 | 33 | 11 | 97 | +| [projektarbeit/lib/Battery/battery.cpp](/projektarbeit/lib/Battery/battery.cpp) | C++ | 45 | 11 | 10 | 66 | +| [projektarbeit/lib/Battery/battery.h](/projektarbeit/lib/Battery/battery.h) | C++ | 33 | 52 | 13 | 98 | +| [projektarbeit/lib/MQTT/debugMqtt.cpp](/projektarbeit/lib/MQTT/debugMqtt.cpp) | C++ | 17 | 0 | 2 | 19 | +| [projektarbeit/lib/MQTT/debugMqtt.h](/projektarbeit/lib/MQTT/debugMqtt.h) | C++ | 6 | 10 | 4 | 20 | +| [projektarbeit/lib/Menu/menu.cpp](/projektarbeit/lib/Menu/menu.cpp) | C++ | 12 | 0 | 4 | 16 | +| [projektarbeit/lib/Menu/menu.h](/projektarbeit/lib/Menu/menu.h) | C++ | 3 | 8 | 3 | 14 | +| [projektarbeit/lib/Menu/menuAction.cpp](/projektarbeit/lib/Menu/menuAction.cpp) | C++ | -1 | -7 | 0 | -8 | +| [projektarbeit/lib/Menu/menuAction.h](/projektarbeit/lib/Menu/menuAction.h) | C++ | 0 | 43 | 8 | 51 | +| [projektarbeit/lib/Menu/menuControl.h](/projektarbeit/lib/Menu/menuControl.h) | C++ | 2 | 33 | 4 | 39 | +| [projektarbeit/lib/Menu/menuIntInput.cpp](/projektarbeit/lib/Menu/menuIntInput.cpp) | C++ | 170 | 14 | 41 | 225 | +| [projektarbeit/lib/Menu/menuIntInput.h](/projektarbeit/lib/Menu/menuIntInput.h) | C++ | 46 | 34 | 20 | 100 | +| [projektarbeit/lib/MotorControl/motorControl.cpp](/projektarbeit/lib/MotorControl/motorControl.cpp) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/lib/MotorControl/motorControl.h](/projektarbeit/lib/MotorControl/motorControl.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/lib/Navigation/navigation.cpp](/projektarbeit/lib/Navigation/navigation.cpp) | C++ | 163 | 18 | 35 | 216 | +| [projektarbeit/lib/Navigation/navigation.h](/projektarbeit/lib/Navigation/navigation.h) | C++ | 37 | 109 | 22 | 168 | +| [projektarbeit/lib/Navigation/route.cpp](/projektarbeit/lib/Navigation/route.cpp) | C++ | 12 | 0 | 2 | 14 | +| [projektarbeit/lib/Navigation/route.h](/projektarbeit/lib/Navigation/route.h) | C++ | 8 | 64 | 8 | 80 | +| [projektarbeit/lib/NtripClient/ntripClient.cpp](/projektarbeit/lib/NtripClient/ntripClient.cpp) | C++ | 186 | 22 | 42 | 250 | +| [projektarbeit/lib/NtripClient/ntripClient.h](/projektarbeit/lib/NtripClient/ntripClient.h) | C++ | 50 | 0 | 16 | 66 | +| [projektarbeit/lib/Speedometer/speedometer.h](/projektarbeit/lib/Speedometer/speedometer.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/lib/Times/debugTimes.cpp](/projektarbeit/lib/Times/debugTimes.cpp) | C++ | 13 | 0 | 5 | 18 | +| [projektarbeit/lib/Times/debugTimes.h](/projektarbeit/lib/Times/debugTimes.h) | C++ | 4 | 2 | 3 | 9 | +| [projektarbeit/platformio.ini](/projektarbeit/platformio.ini) | Ini | 4 | 0 | 1 | 5 | +| [projektarbeit/src/OutputBuf/outputBuf.cpp](/projektarbeit/src/OutputBuf/outputBuf.cpp) | C++ | 36 | 11 | 13 | 60 | +| [projektarbeit/src/OutputBuf/outputBuf.h](/projektarbeit/src/OutputBuf/outputBuf.h) | C++ | 24 | 32 | 12 | 68 | +| [projektarbeit/src/SpecialMenus/Akku/menuAkku.cpp](/projektarbeit/src/SpecialMenus/Akku/menuAkku.cpp) | C++ | 48 | 10 | 12 | 70 | +| [projektarbeit/src/SpecialMenus/Akku/menuAkku.h](/projektarbeit/src/SpecialMenus/Akku/menuAkku.h) | C++ | 22 | 31 | 12 | 65 | +| [projektarbeit/src/SpecialMenus/GPS/menuGPS.cpp](/projektarbeit/src/SpecialMenus/GPS/menuGPS.cpp) | C++ | 159 | 10 | 23 | 192 | +| [projektarbeit/src/SpecialMenus/GPS/menuGPS.h](/projektarbeit/src/SpecialMenus/GPS/menuGPS.h) | C++ | 28 | 47 | 18 | 93 | +| [projektarbeit/src/SpecialMenus/PID/menuPidSettings.cpp](/projektarbeit/src/SpecialMenus/PID/menuPidSettings.cpp) | C++ | 65 | 10 | 19 | 94 | +| [projektarbeit/src/SpecialMenus/PID/menuPidSettings.h](/projektarbeit/src/SpecialMenus/PID/menuPidSettings.h) | C++ | 23 | 43 | 16 | 82 | +| [projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp](/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp) | C++ | 69 | 11 | 14 | 94 | +| [projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h](/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h) | C++ | 16 | 31 | 10 | 57 | +| [projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp](/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp) | C++ | 25 | 10 | 6 | 41 | +| [projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h](/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h) | C++ | 14 | 31 | 8 | 53 | +| [projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp](/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp) | C++ | 12 | 10 | 3 | 25 | +| [projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h](/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h) | C++ | 9 | 27 | 6 | 42 | +| [projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp](/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp) | C++ | 115 | 23 | 29 | 167 | +| [projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.h](/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.h) | C++ | 37 | 10 | 11 | 58 | +| [projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.cpp](/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.cpp) | C++ | 13 | 10 | 5 | 28 | +| [projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.h](/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.h) | C++ | 20 | 22 | 8 | 50 | +| [projektarbeit/src/SpecialMenus/menuCaptureRoute.cpp](/projektarbeit/src/SpecialMenus/menuCaptureRoute.cpp) | C++ | -12 | -10 | -2 | -24 | +| [projektarbeit/src/SpecialMenus/menuCaptureRoute.h](/projektarbeit/src/SpecialMenus/menuCaptureRoute.h) | C++ | -9 | -10 | -3 | -22 | +| [projektarbeit/src/SpecialMenus/menuDriveMode.cpp](/projektarbeit/src/SpecialMenus/menuDriveMode.cpp) | C++ | -12 | -10 | -4 | -26 | +| [projektarbeit/src/SpecialMenus/menuDriveMode.h](/projektarbeit/src/SpecialMenus/menuDriveMode.h) | C++ | -18 | -10 | -6 | -34 | +| [projektarbeit/src/SpecialMenus/menuGPS.cpp](/projektarbeit/src/SpecialMenus/menuGPS.cpp) | C++ | -40 | -10 | -7 | -57 | +| [projektarbeit/src/SpecialMenus/menuGPS.h](/projektarbeit/src/SpecialMenus/menuGPS.h) | C++ | -18 | -10 | -8 | -36 | +| [projektarbeit/src/SpecialMenus/menuManualDrive.cpp](/projektarbeit/src/SpecialMenus/menuManualDrive.cpp) | C++ | -12 | -10 | -2 | -24 | +| [projektarbeit/src/SpecialMenus/menuManualDrive.h](/projektarbeit/src/SpecialMenus/menuManualDrive.h) | C++ | -9 | -10 | -4 | -23 | +| [projektarbeit/src/SpecialMenus/menuPidSettings.cpp](/projektarbeit/src/SpecialMenus/menuPidSettings.cpp) | C++ | -66 | -10 | -19 | -95 | +| [projektarbeit/src/SpecialMenus/menuPidSettings.h](/projektarbeit/src/SpecialMenus/menuPidSettings.h) | C++ | -23 | -11 | -10 | -44 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilot.cpp](/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.cpp) | C++ | 66 | 11 | 16 | 93 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilot.h](/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.h) | C++ | 16 | 82 | 11 | 109 | +| [projektarbeit/src/driveModi/Modi/Autopilot/autopilotConfig.h](/projektarbeit/src/driveModi/Modi/Autopilot/autopilotConfig.h) | C++ | 9 | 36 | 10 | 55 | +| [projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.cpp](/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.cpp) | C++ | 19 | 10 | 3 | 32 | +| [projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.h](/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.h) | C++ | 7 | 51 | 7 | 65 | +| [projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.cpp](/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.cpp) | C++ | -35 | 10 | -4 | -29 | +| [projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.h](/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.h) | C++ | -11 | 10 | -2 | -3 | +| [projektarbeit/src/driveModi/Modi/ManualControl/manualControl.cpp](/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.cpp) | C++ | -1 | 0 | 1 | 0 | +| [projektarbeit/src/driveModi/Modi/ManualControl/manualControl.h](/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.h) | C++ | 1 | 0 | 0 | 1 | +| [projektarbeit/src/driveModi/Modi/Racing/racing.cpp](/projektarbeit/src/driveModi/Modi/Racing/racing.cpp) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/src/driveModi/Modi/Racing/racing.h](/projektarbeit/src/driveModi/Modi/Racing/racing.h) | C++ | 0 | 0 | 1 | 1 | +| [projektarbeit/src/driveModi/Modi/TestMode/testMode.cpp](/projektarbeit/src/driveModi/Modi/TestMode/testMode.cpp) | C++ | 99 | 14 | 27 | 140 | +| [projektarbeit/src/driveModi/Modi/TestMode/testMode.h](/projektarbeit/src/driveModi/Modi/TestMode/testMode.h) | C++ | 26 | 10 | 13 | 49 | +| [projektarbeit/src/driveModi/driveManager.cpp](/projektarbeit/src/driveModi/driveManager.cpp) | C++ | 15 | 2 | 4 | 21 | +| [projektarbeit/src/driveModi/driveManager.h](/projektarbeit/src/driveModi/driveManager.h) | C++ | 3 | 57 | 5 | 65 | +| [projektarbeit/src/driveModi/driveModi.h](/projektarbeit/src/driveModi/driveModi.h) | C++ | 1 | 12 | 3 | 16 | +| [projektarbeit/src/main.cpp](/projektarbeit/src/main.cpp) | C++ | 61 | 29 | 10 | 100 | +| [projektarbeit/src/moveControl.cpp](/projektarbeit/src/moveControl.cpp) | C++ | 22 | 10 | 5 | 37 | +| [projektarbeit/src/network.cpp](/projektarbeit/src/network.cpp) | C++ | 22 | -1 | 3 | 24 | + +[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/diff.csv b/.VSCodeCounter/2022-12-09_11-39-58/diff.csv new file mode 100644 index 0000000..3d8e2d2 --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/diff.csv @@ -0,0 +1,84 @@ +"filename", "language", "umlet", "Ini", "C++", "Python", "Markdown", "JSON", "comment", "blank", "total" +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\details.md", "Markdown", 0, 0, 0, 0, 71, 0, 0, 6, 77 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff-details.md", "Markdown", 0, 0, 0, 0, 52, 0, 0, 6, 58 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff.md", "Markdown", 0, 0, 0, 0, 31, 0, 0, 7, 38 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.json", "JSON", 0, 0, 0, 0, 0, 1, 0, 0, 1 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.md", "Markdown", 0, 0, 0, 0, 44, 0, 0, 7, 51 +"c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main.py", "Python", 0, 0, 0, -1, 0, 0, 0, 0, -1 +"c:\Users\alex1\git\projektarbeit\doc\Diagrams\classdiagramm.uxf", "umlet", 47, 0, 0, 0, 0, 0, 0, 15, 62 +"c:\Users\alex1\git\projektarbeit\include\config.h", "C++", 0, 0, 4, 0, 0, 0, 14, 1, 19 +"c:\Users\alex1\git\projektarbeit\include\moveControl.h", "C++", 0, 0, 10, 0, 0, 0, -2, 2, 10 +"c:\Users\alex1\git\projektarbeit\include\moveControlConfig.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\include\network.h", "C++", 0, 0, 2, 0, 0, 0, 46, 5, 53 +"c:\Users\alex1\git\projektarbeit\include\networkConfig.h", "C++", 0, 0, 53, 0, 0, 0, 33, 11, 97 +"c:\Users\alex1\git\projektarbeit\lib\Battery\battery.cpp", "C++", 0, 0, 45, 0, 0, 0, 11, 10, 66 +"c:\Users\alex1\git\projektarbeit\lib\Battery\battery.h", "C++", 0, 0, 33, 0, 0, 0, 52, 13, 98 +"c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.cpp", "C++", 0, 0, 17, 0, 0, 0, 0, 2, 19 +"c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.h", "C++", 0, 0, 6, 0, 0, 0, 10, 4, 20 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menu.cpp", "C++", 0, 0, 12, 0, 0, 0, 0, 4, 16 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menu.h", "C++", 0, 0, 3, 0, 0, 0, 8, 3, 14 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.cpp", "C++", 0, 0, -1, 0, 0, 0, -7, 0, -8 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.h", "C++", 0, 0, 0, 0, 0, 0, 43, 8, 51 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuControl.h", "C++", 0, 0, 2, 0, 0, 0, 33, 4, 39 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.cpp", "C++", 0, 0, 170, 0, 0, 0, 14, 41, 225 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.h", "C++", 0, 0, 46, 0, 0, 0, 34, 20, 100 +"c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.cpp", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.cpp", "C++", 0, 0, 163, 0, 0, 0, 18, 35, 216 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.h", "C++", 0, 0, 37, 0, 0, 0, 109, 22, 168 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\route.cpp", "C++", 0, 0, 12, 0, 0, 0, 0, 2, 14 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\route.h", "C++", 0, 0, 8, 0, 0, 0, 64, 8, 80 +"c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.cpp", "C++", 0, 0, 186, 0, 0, 0, 22, 42, 250 +"c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.h", "C++", 0, 0, 50, 0, 0, 0, 0, 16, 66 +"c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.cpp", "C++", 0, 0, 13, 0, 0, 0, 0, 5, 18 +"c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.h", "C++", 0, 0, 4, 0, 0, 0, 2, 3, 9 +"c:\Users\alex1\git\projektarbeit\platformio.ini", "Ini", 0, 4, 0, 0, 0, 0, 0, 1, 5 +"c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.cpp", "C++", 0, 0, 36, 0, 0, 0, 11, 13, 60 +"c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.h", "C++", 0, 0, 24, 0, 0, 0, 32, 12, 68 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.cpp", "C++", 0, 0, 48, 0, 0, 0, 10, 12, 70 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.h", "C++", 0, 0, 22, 0, 0, 0, 31, 12, 65 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.cpp", "C++", 0, 0, 159, 0, 0, 0, 10, 23, 192 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.h", "C++", 0, 0, 28, 0, 0, 0, 47, 18, 93 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.cpp", "C++", 0, 0, 65, 0, 0, 0, 10, 19, 94 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.h", "C++", 0, 0, 23, 0, 0, 0, 43, 16, 82 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.cpp", "C++", 0, 0, 69, 0, 0, 0, 11, 14, 94 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.h", "C++", 0, 0, 16, 0, 0, 0, 31, 10, 57 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.cpp", "C++", 0, 0, 25, 0, 0, 0, 10, 6, 41 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.h", "C++", 0, 0, 14, 0, 0, 0, 31, 8, 53 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.cpp", "C++", 0, 0, 12, 0, 0, 0, 10, 3, 25 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.h", "C++", 0, 0, 9, 0, 0, 0, 27, 6, 42 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.cpp", "C++", 0, 0, 115, 0, 0, 0, 23, 29, 167 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.h", "C++", 0, 0, 37, 0, 0, 0, 10, 11, 58 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.cpp", "C++", 0, 0, 13, 0, 0, 0, 10, 5, 28 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.h", "C++", 0, 0, 20, 0, 0, 0, 22, 8, 50 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuCaptureRoute.cpp", "C++", 0, 0, -12, 0, 0, 0, -10, -2, -24 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuCaptureRoute.h", "C++", 0, 0, -9, 0, 0, 0, -10, -3, -22 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuDriveMode.cpp", "C++", 0, 0, -12, 0, 0, 0, -10, -4, -26 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuDriveMode.h", "C++", 0, 0, -18, 0, 0, 0, -10, -6, -34 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuGPS.cpp", "C++", 0, 0, -40, 0, 0, 0, -10, -7, -57 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuGPS.h", "C++", 0, 0, -18, 0, 0, 0, -10, -8, -36 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuManualDrive.cpp", "C++", 0, 0, -12, 0, 0, 0, -10, -2, -24 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuManualDrive.h", "C++", 0, 0, -9, 0, 0, 0, -10, -4, -23 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuPidSettings.cpp", "C++", 0, 0, -66, 0, 0, 0, -10, -19, -95 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuPidSettings.h", "C++", 0, 0, -23, 0, 0, 0, -11, -10, -44 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.cpp", "C++", 0, 0, 66, 0, 0, 0, 11, 16, 93 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.h", "C++", 0, 0, 16, 0, 0, 0, 82, 11, 109 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilotConfig.h", "C++", 0, 0, 9, 0, 0, 0, 36, 10, 55 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.cpp", "C++", 0, 0, 19, 0, 0, 0, 10, 3, 32 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.h", "C++", 0, 0, 7, 0, 0, 0, 51, 7, 65 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.cpp", "C++", 0, 0, -35, 0, 0, 0, 10, -4, -29 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.h", "C++", 0, 0, -11, 0, 0, 0, 10, -2, -3 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.cpp", "C++", 0, 0, -1, 0, 0, 0, 0, 1, 0 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.h", "C++", 0, 0, 1, 0, 0, 0, 0, 0, 1 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.cpp", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.cpp", "C++", 0, 0, 99, 0, 0, 0, 14, 27, 140 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.h", "C++", 0, 0, 26, 0, 0, 0, 10, 13, 49 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.cpp", "C++", 0, 0, 15, 0, 0, 0, 2, 4, 21 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.h", "C++", 0, 0, 3, 0, 0, 0, 57, 5, 65 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveModi.h", "C++", 0, 0, 1, 0, 0, 0, 12, 3, 16 +"c:\Users\alex1\git\projektarbeit\src\main.cpp", "C++", 0, 0, 61, 0, 0, 0, 29, 10, 100 +"c:\Users\alex1\git\projektarbeit\src\moveControl.cpp", "C++", 0, 0, 22, 0, 0, 0, 10, 5, 37 +"c:\Users\alex1\git\projektarbeit\src\network.cpp", "C++", 0, 0, 22, 0, 0, 0, -1, 3, 24 +"Total", "-", 47, 4, 1711, -1, 198, 1, 1125, 581, 3666 \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/diff.md b/.VSCodeCounter/2022-12-09_11-39-58/diff.md new file mode 100644 index 0000000..480428e --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/diff.md @@ -0,0 +1,61 @@ +# Diff Summary + +Date : 2022-12-09 11:39:58 + +Directory c:\\Users\\alex1\\git\\projektarbeit + +Total : 82 files, 1960 codes, 1125 comments, 581 blanks, all 3666 lines + +[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md) + +## Languages +| language | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| C++ | 74 | 1,711 | 1,125 | 539 | 3,375 | +| Markdown | 4 | 198 | 0 | 26 | 224 | +| umlet | 1 | 47 | 0 | 15 | 62 | +| Ini | 1 | 4 | 0 | 1 | 5 | +| JSON | 1 | 1 | 0 | 0 | 1 | +| Python | 1 | -1 | 0 | 0 | -1 | + +## Directories +| path | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| . | 82 | 1,960 | 1,125 | 581 | 3,666 | +| .VSCodeCounter | 5 | 199 | 0 | 26 | 225 | +| .VSCodeCounter\\2022-02-01_10-50-06 | 5 | 199 | 0 | 26 | 225 | +| debugMqtt | 1 | -1 | 0 | 0 | -1 | +| debugMqtt\\hw1 | 1 | -1 | 0 | 0 | -1 | +| doc | 1 | 47 | 0 | 15 | 62 | +| doc\\Diagrams | 1 | 47 | 0 | 15 | 62 | +| include | 5 | 69 | 91 | 20 | 180 | +| lib | 22 | 806 | 413 | 245 | 1,464 | +| lib\\Battery | 2 | 78 | 63 | 23 | 164 | +| lib\\MQTT | 2 | 23 | 10 | 6 | 39 | +| lib\\Menu | 7 | 232 | 125 | 80 | 437 | +| lib\\MotorControl | 2 | 0 | 0 | 2 | 2 | +| lib\\Navigation | 4 | 220 | 191 | 67 | 478 | +| lib\\NtripClient | 2 | 236 | 22 | 58 | 316 | +| lib\\Speedometer | 1 | 0 | 0 | 1 | 1 | +| lib\\Times | 2 | 17 | 2 | 8 | 27 | +| src | 47 | 836 | 621 | 274 | 1,731 | +| src\\OutputBuf | 2 | 60 | 43 | 25 | 128 | +| src\\SpecialMenus | 26 | 456 | 235 | 135 | 826 | +| src\\SpecialMenus\\Akku | 2 | 70 | 41 | 24 | 135 | +| src\\SpecialMenus\\GPS | 2 | 187 | 57 | 41 | 285 | +| src\\SpecialMenus\\PID | 2 | 88 | 53 | 35 | 176 | +| src\\SpecialMenus\\driveModi | 10 | 330 | 185 | 100 | 615 | +| src\\SpecialMenus\\driveModi\\Autopilot | 2 | 85 | 42 | 24 | 151 | +| src\\SpecialMenus\\driveModi\\CaptureRoute | 2 | 39 | 41 | 14 | 94 | +| src\\SpecialMenus\\driveModi\\ManualDrive | 2 | 21 | 37 | 9 | 67 | +| src\\SpecialMenus\\driveModi\\TestMode | 2 | 152 | 33 | 40 | 225 | +| src\\driveModi | 16 | 215 | 305 | 96 | 616 | +| src\\driveModi\\Modi | 13 | 196 | 234 | 84 | 514 | +| src\\driveModi\\Modi\\Autopilot | 3 | 91 | 129 | 37 | 257 | +| src\\driveModi\\Modi\\CaptureRoute | 2 | 26 | 61 | 10 | 97 | +| src\\driveModi\\Modi\\ConsolControl | 2 | -46 | 20 | -6 | -32 | +| src\\driveModi\\Modi\\ManualControl | 2 | 0 | 0 | 1 | 1 | +| src\\driveModi\\Modi\\Racing | 2 | 0 | 0 | 2 | 2 | +| src\\driveModi\\Modi\\TestMode | 2 | 125 | 24 | 40 | 189 | + +[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/diff.txt b/.VSCodeCounter/2022-12-09_11-39-58/diff.txt new file mode 100644 index 0000000..fcb6fb6 --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/diff.txt @@ -0,0 +1,146 @@ +Date : 2022-12-09 11:39:58 +Directory : c:\Users\alex1\git\projektarbeit +Total : 82 files, 1960 codes, 1125 comments, 581 blanks, all 3666 lines + +Languages ++----------+------------+------------+------------+------------+------------+ +| language | files | code | comment | blank | total | ++----------+------------+------------+------------+------------+------------+ +| C++ | 74 | 1,711 | 1,125 | 539 | 3,375 | +| Markdown | 4 | 198 | 0 | 26 | 224 | +| umlet | 1 | 47 | 0 | 15 | 62 | +| Ini | 1 | 4 | 0 | 1 | 5 | +| JSON | 1 | 1 | 0 | 0 | 1 | +| Python | 1 | -1 | 0 | 0 | -1 | ++----------+------------+------------+------------+------------+------------+ + +Directories ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| path | files | code | comment | blank | total | ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| . | 82 | 1,960 | 1,125 | 581 | 3,666 | +| .VSCodeCounter | 5 | 199 | 0 | 26 | 225 | +| .VSCodeCounter\2022-02-01_10-50-06 | 5 | 199 | 0 | 26 | 225 | +| debugMqtt | 1 | -1 | 0 | 0 | -1 | +| debugMqtt\hw1 | 1 | -1 | 0 | 0 | -1 | +| doc | 1 | 47 | 0 | 15 | 62 | +| doc\Diagrams | 1 | 47 | 0 | 15 | 62 | +| include | 5 | 69 | 91 | 20 | 180 | +| lib | 22 | 806 | 413 | 245 | 1,464 | +| lib\Battery | 2 | 78 | 63 | 23 | 164 | +| lib\MQTT | 2 | 23 | 10 | 6 | 39 | +| lib\Menu | 7 | 232 | 125 | 80 | 437 | +| lib\MotorControl | 2 | 0 | 0 | 2 | 2 | +| lib\Navigation | 4 | 220 | 191 | 67 | 478 | +| lib\NtripClient | 2 | 236 | 22 | 58 | 316 | +| lib\Speedometer | 1 | 0 | 0 | 1 | 1 | +| lib\Times | 2 | 17 | 2 | 8 | 27 | +| src | 47 | 836 | 621 | 274 | 1,731 | +| src\OutputBuf | 2 | 60 | 43 | 25 | 128 | +| src\SpecialMenus | 26 | 456 | 235 | 135 | 826 | +| src\SpecialMenus\Akku | 2 | 70 | 41 | 24 | 135 | +| src\SpecialMenus\GPS | 2 | 187 | 57 | 41 | 285 | +| src\SpecialMenus\PID | 2 | 88 | 53 | 35 | 176 | +| src\SpecialMenus\driveModi | 10 | 330 | 185 | 100 | 615 | +| src\SpecialMenus\driveModi\Autopilot | 2 | 85 | 42 | 24 | 151 | +| src\SpecialMenus\driveModi\CaptureRoute | 2 | 39 | 41 | 14 | 94 | +| src\SpecialMenus\driveModi\ManualDrive | 2 | 21 | 37 | 9 | 67 | +| src\SpecialMenus\driveModi\TestMode | 2 | 152 | 33 | 40 | 225 | +| src\driveModi | 16 | 215 | 305 | 96 | 616 | +| src\driveModi\Modi | 13 | 196 | 234 | 84 | 514 | +| src\driveModi\Modi\Autopilot | 3 | 91 | 129 | 37 | 257 | +| src\driveModi\Modi\CaptureRoute | 2 | 26 | 61 | 10 | 97 | +| src\driveModi\Modi\ConsolControl | 2 | -46 | 20 | -6 | -32 | +| src\driveModi\Modi\ManualControl | 2 | 0 | 0 | 1 | 1 | +| src\driveModi\Modi\Racing | 2 | 0 | 0 | 2 | 2 | +| src\driveModi\Modi\TestMode | 2 | 125 | 24 | 40 | 189 | ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ + +Files ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ +| filename | language | code | comment | blank | total | ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\details.md | Markdown | 71 | 0 | 6 | 77 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff-details.md | Markdown | 52 | 0 | 6 | 58 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff.md | Markdown | 31 | 0 | 7 | 38 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.json | JSON | 1 | 0 | 0 | 1 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.md | Markdown | 44 | 0 | 7 | 51 | +| c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main.py | Python | -1 | 0 | 0 | -1 | +| c:\Users\alex1\git\projektarbeit\doc\Diagrams\classdiagramm.uxf | umlet | 47 | 0 | 15 | 62 | +| c:\Users\alex1\git\projektarbeit\include\config.h | C++ | 4 | 14 | 1 | 19 | +| c:\Users\alex1\git\projektarbeit\include\moveControl.h | C++ | 10 | -2 | 2 | 10 | +| c:\Users\alex1\git\projektarbeit\include\moveControlConfig.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\include\network.h | C++ | 2 | 46 | 5 | 53 | +| c:\Users\alex1\git\projektarbeit\include\networkConfig.h | C++ | 53 | 33 | 11 | 97 | +| c:\Users\alex1\git\projektarbeit\lib\Battery\battery.cpp | C++ | 45 | 11 | 10 | 66 | +| c:\Users\alex1\git\projektarbeit\lib\Battery\battery.h | C++ | 33 | 52 | 13 | 98 | +| c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.cpp | C++ | 17 | 0 | 2 | 19 | +| c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.h | C++ | 6 | 10 | 4 | 20 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menu.cpp | C++ | 12 | 0 | 4 | 16 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menu.h | C++ | 3 | 8 | 3 | 14 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.cpp | C++ | -1 | -7 | 0 | -8 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.h | C++ | 0 | 43 | 8 | 51 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuControl.h | C++ | 2 | 33 | 4 | 39 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.cpp | C++ | 170 | 14 | 41 | 225 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.h | C++ | 46 | 34 | 20 | 100 | +| c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.cpp | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.cpp | C++ | 163 | 18 | 35 | 216 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.h | C++ | 37 | 109 | 22 | 168 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\route.cpp | C++ | 12 | 0 | 2 | 14 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\route.h | C++ | 8 | 64 | 8 | 80 | +| c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.cpp | C++ | 186 | 22 | 42 | 250 | +| c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.h | C++ | 50 | 0 | 16 | 66 | +| c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.cpp | C++ | 13 | 0 | 5 | 18 | +| c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.h | C++ | 4 | 2 | 3 | 9 | +| c:\Users\alex1\git\projektarbeit\platformio.ini | Ini | 4 | 0 | 1 | 5 | +| c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.cpp | C++ | 36 | 11 | 13 | 60 | +| c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.h | C++ | 24 | 32 | 12 | 68 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.cpp | C++ | 48 | 10 | 12 | 70 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.h | C++ | 22 | 31 | 12 | 65 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.cpp | C++ | 159 | 10 | 23 | 192 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.h | C++ | 28 | 47 | 18 | 93 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.cpp | C++ | 65 | 10 | 19 | 94 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.h | C++ | 23 | 43 | 16 | 82 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.cpp | C++ | 69 | 11 | 14 | 94 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.h | C++ | 16 | 31 | 10 | 57 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.cpp | C++ | 25 | 10 | 6 | 41 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.h | C++ | 14 | 31 | 8 | 53 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.cpp | C++ | 12 | 10 | 3 | 25 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.h | C++ | 9 | 27 | 6 | 42 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.cpp | C++ | 115 | 23 | 29 | 167 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.h | C++ | 37 | 10 | 11 | 58 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.cpp | C++ | 13 | 10 | 5 | 28 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.h | C++ | 20 | 22 | 8 | 50 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuCaptureRoute.cpp | C++ | -12 | -10 | -2 | -24 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuCaptureRoute.h | C++ | -9 | -10 | -3 | -22 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuDriveMode.cpp | C++ | -12 | -10 | -4 | -26 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuDriveMode.h | C++ | -18 | -10 | -6 | -34 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuGPS.cpp | C++ | -40 | -10 | -7 | -57 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuGPS.h | C++ | -18 | -10 | -8 | -36 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuManualDrive.cpp | C++ | -12 | -10 | -2 | -24 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuManualDrive.h | C++ | -9 | -10 | -4 | -23 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuPidSettings.cpp | C++ | -66 | -10 | -19 | -95 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\menuPidSettings.h | C++ | -23 | -11 | -10 | -44 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.cpp | C++ | 66 | 11 | 16 | 93 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.h | C++ | 16 | 82 | 11 | 109 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilotConfig.h | C++ | 9 | 36 | 10 | 55 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.cpp | C++ | 19 | 10 | 3 | 32 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.h | C++ | 7 | 51 | 7 | 65 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.cpp | C++ | -35 | 10 | -4 | -29 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.h | C++ | -11 | 10 | -2 | -3 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.cpp | C++ | -1 | 0 | 1 | 0 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.h | C++ | 1 | 0 | 0 | 1 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.cpp | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.cpp | C++ | 99 | 14 | 27 | 140 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.h | C++ | 26 | 10 | 13 | 49 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.cpp | C++ | 15 | 2 | 4 | 21 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.h | C++ | 3 | 57 | 5 | 65 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveModi.h | C++ | 1 | 12 | 3 | 16 | +| c:\Users\alex1\git\projektarbeit\src\main.cpp | C++ | 61 | 29 | 10 | 100 | +| c:\Users\alex1\git\projektarbeit\src\moveControl.cpp | C++ | 22 | 10 | 5 | 37 | +| c:\Users\alex1\git\projektarbeit\src\network.cpp | C++ | 22 | -1 | 3 | 24 | +| Total | | 1,960 | 1,125 | 581 | 3,666 | ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/results.csv b/.VSCodeCounter/2022-12-09_11-39-58/results.csv new file mode 100644 index 0000000..0b6c030 --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/results.csv @@ -0,0 +1,86 @@ +"filename", "language", "umlet", "Ini", "C++", "Python", "Markdown", "JSON", "comment", "blank", "total" +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\details.md", "Markdown", 0, 0, 0, 0, 60, 0, 0, 6, 66 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\diff-details.md", "Markdown", 0, 0, 0, 0, 9, 0, 0, 6, 15 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\diff.md", "Markdown", 0, 0, 0, 0, 12, 0, 0, 7, 19 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\results.json", "JSON", 0, 0, 0, 0, 0, 1, 0, 0, 1 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\results.md", "Markdown", 0, 0, 0, 0, 39, 0, 0, 7, 46 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\details.md", "Markdown", 0, 0, 0, 0, 71, 0, 0, 6, 77 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff-details.md", "Markdown", 0, 0, 0, 0, 52, 0, 0, 6, 58 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff.md", "Markdown", 0, 0, 0, 0, 31, 0, 0, 7, 38 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.json", "JSON", 0, 0, 0, 0, 0, 1, 0, 0, 1 +"c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.md", "Markdown", 0, 0, 0, 0, 44, 0, 0, 7, 51 +"c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main.py", "Python", 0, 0, 0, 14, 0, 0, 2, 10, 26 +"c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main_debug.py", "Python", 0, 0, 0, 12, 0, 0, 2, 10, 24 +"c:\Users\alex1\git\projektarbeit\debugMqtt\rhede\main.py", "Python", 0, 0, 0, 16, 0, 0, 2, 10, 28 +"c:\Users\alex1\git\projektarbeit\debugMqtt\rhede\main_debug.py", "Python", 0, 0, 0, 13, 0, 0, 2, 10, 25 +"c:\Users\alex1\git\projektarbeit\doc\Diagrams\classdiagramm.uxf", "umlet", 142, 0, 0, 0, 0, 0, 0, 15, 157 +"c:\Users\alex1\git\projektarbeit\doc\Diagrams\statesAutopilot.uxf", "umlet", 389, 0, 0, 0, 0, 0, 0, 2, 391 +"c:\Users\alex1\git\projektarbeit\include\config.h", "C++", 0, 0, 5, 0, 0, 0, 15, 2, 22 +"c:\Users\alex1\git\projektarbeit\include\moveControl.h", "C++", 0, 0, 54, 0, 0, 0, 102, 23, 179 +"c:\Users\alex1\git\projektarbeit\include\moveControlConfig.h", "C++", 0, 0, 23, 0, 0, 0, 18, 4, 45 +"c:\Users\alex1\git\projektarbeit\include\network.h", "C++", 0, 0, 25, 0, 0, 0, 56, 14, 95 +"c:\Users\alex1\git\projektarbeit\include\networkConfig.h", "C++", 0, 0, 97, 0, 0, 0, 37, 17, 151 +"c:\Users\alex1\git\projektarbeit\lib\Battery\battery.cpp", "C++", 0, 0, 45, 0, 0, 0, 11, 10, 66 +"c:\Users\alex1\git\projektarbeit\lib\Battery\battery.h", "C++", 0, 0, 33, 0, 0, 0, 52, 13, 98 +"c:\Users\alex1\git\projektarbeit\lib\Illumination\underfloorLighting.cpp", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\lib\Illumination\underfloorLighting.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.cpp", "C++", 0, 0, 81, 0, 0, 0, 12, 17, 110 +"c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.h", "C++", 0, 0, 41, 0, 0, 0, 120, 18, 179 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menu.cpp", "C++", 0, 0, 106, 0, 0, 0, 11, 19, 136 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menu.h", "C++", 0, 0, 26, 0, 0, 0, 18, 12, 56 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.cpp", "C++", 0, 0, 36, 0, 0, 0, 10, 9, 55 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.h", "C++", 0, 0, 21, 0, 0, 0, 53, 15, 89 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuControl.h", "C++", 0, 0, 22, 0, 0, 0, 44, 10, 76 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.cpp", "C++", 0, 0, 170, 0, 0, 0, 14, 41, 225 +"c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.h", "C++", 0, 0, 46, 0, 0, 0, 34, 20, 100 +"c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.cpp", "C++", 0, 0, 144, 0, 0, 0, 24, 35, 203 +"c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.h", "C++", 0, 0, 47, 0, 0, 0, 102, 22, 171 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.cpp", "C++", 0, 0, 178, 0, 0, 0, 28, 40, 246 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.h", "C++", 0, 0, 53, 0, 0, 0, 119, 29, 201 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\route.cpp", "C++", 0, 0, 28, 0, 0, 0, 10, 8, 46 +"c:\Users\alex1\git\projektarbeit\lib\Navigation\route.h", "C++", 0, 0, 34, 0, 0, 0, 74, 20, 128 +"c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.cpp", "C++", 0, 0, 186, 0, 0, 0, 22, 42, 250 +"c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.h", "C++", 0, 0, 50, 0, 0, 0, 0, 16, 66 +"c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.cpp", "C++", 0, 0, 81, 0, 0, 0, 12, 21, 114 +"c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.h", "C++", 0, 0, 35, 0, 0, 0, 68, 22, 125 +"c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.cpp", "C++", 0, 0, 28, 0, 0, 0, 10, 9, 47 +"c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.h", "C++", 0, 0, 19, 0, 0, 0, 40, 13, 72 +"c:\Users\alex1\git\projektarbeit\platformio.ini", "Ini", 0, 19, 0, 0, 0, 0, 9, 3, 31 +"c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.cpp", "C++", 0, 0, 36, 0, 0, 0, 11, 13, 60 +"c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.h", "C++", 0, 0, 24, 0, 0, 0, 32, 12, 68 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.cpp", "C++", 0, 0, 48, 0, 0, 0, 10, 12, 70 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.h", "C++", 0, 0, 22, 0, 0, 0, 31, 12, 65 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.cpp", "C++", 0, 0, 159, 0, 0, 0, 10, 23, 192 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.h", "C++", 0, 0, 28, 0, 0, 0, 47, 18, 93 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.cpp", "C++", 0, 0, 65, 0, 0, 0, 10, 19, 94 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.h", "C++", 0, 0, 23, 0, 0, 0, 43, 16, 82 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.cpp", "C++", 0, 0, 69, 0, 0, 0, 11, 14, 94 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.h", "C++", 0, 0, 16, 0, 0, 0, 31, 10, 57 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.cpp", "C++", 0, 0, 25, 0, 0, 0, 10, 6, 41 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.h", "C++", 0, 0, 14, 0, 0, 0, 31, 8, 53 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.cpp", "C++", 0, 0, 12, 0, 0, 0, 10, 3, 25 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.h", "C++", 0, 0, 9, 0, 0, 0, 27, 6, 42 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.cpp", "C++", 0, 0, 115, 0, 0, 0, 23, 29, 167 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.h", "C++", 0, 0, 37, 0, 0, 0, 10, 11, 58 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.cpp", "C++", 0, 0, 13, 0, 0, 0, 10, 5, 28 +"c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.h", "C++", 0, 0, 20, 0, 0, 0, 22, 8, 50 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.cpp", "C++", 0, 0, 73, 0, 0, 0, 11, 20, 104 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.h", "C++", 0, 0, 34, 0, 0, 0, 82, 19, 135 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilotConfig.h", "C++", 0, 0, 9, 0, 0, 0, 36, 10, 55 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.cpp", "C++", 0, 0, 29, 0, 0, 0, 10, 7, 46 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.h", "C++", 0, 0, 21, 0, 0, 0, 51, 13, 85 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.cpp", "C++", 0, 0, 1, 0, 0, 0, 10, 3, 14 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.h", "C++", 0, 0, 6, 0, 0, 0, 10, 5, 21 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.cpp", "C++", 0, 0, 25, 0, 0, 0, 10, 7, 42 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.h", "C++", 0, 0, 22, 0, 0, 0, 49, 12, 83 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.cpp", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.h", "C++", 0, 0, 0, 0, 0, 0, 0, 1, 1 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.cpp", "C++", 0, 0, 99, 0, 0, 0, 14, 28, 141 +"c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.h", "C++", 0, 0, 26, 0, 0, 0, 10, 14, 50 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.cpp", "C++", 0, 0, 63, 0, 0, 0, 13, 21, 97 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.h", "C++", 0, 0, 41, 0, 0, 0, 69, 17, 127 +"c:\Users\alex1\git\projektarbeit\src\driveModi\driveModi.h", "C++", 0, 0, 10, 0, 0, 0, 22, 6, 38 +"c:\Users\alex1\git\projektarbeit\src\main.cpp", "C++", 0, 0, 227, 0, 0, 0, 38, 43, 308 +"c:\Users\alex1\git\projektarbeit\src\moveControl.cpp", "C++", 0, 0, 133, 0, 0, 0, 35, 34, 202 +"c:\Users\alex1\git\projektarbeit\src\network.cpp", "C++", 0, 0, 86, 0, 0, 0, 16, 17, 119 +"Total", "-", 531, 19, 3354, 55, 318, 2, 1998, 1138, 7415 \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/results.json b/.VSCodeCounter/2022-12-09_11-39-58/results.json new file mode 100644 index 0000000..a458cad --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/results.json @@ -0,0 +1 @@ +{"file:///c%3A/Users/alex1/git/projektarbeit/doc/Diagrams/statesAutopilot.uxf":{"language":"umlet","code":389,"comment":0,"blank":2},"file:///c%3A/Users/alex1/git/projektarbeit/doc/Diagrams/classdiagramm.uxf":{"language":"umlet","code":142,"comment":0,"blank":15},"file:///c%3A/Users/alex1/git/projektarbeit/platformio.ini":{"language":"Ini","code":19,"comment":9,"blank":3},"file:///c%3A/Users/alex1/git/projektarbeit/include/moveControlConfig.h":{"language":"C++","code":23,"comment":18,"blank":4},"file:///c%3A/Users/alex1/git/projektarbeit/include/config.h":{"language":"C++","code":5,"comment":15,"blank":2},"file:///c%3A/Users/alex1/git/projektarbeit/include/network.h":{"language":"C++","code":25,"comment":56,"blank":14},"file:///c%3A/Users/alex1/git/projektarbeit/src/OutputBuf/outputBuf.cpp":{"language":"C++","code":36,"comment":11,"blank":13},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/GPS/menuGPS.h":{"language":"C++","code":28,"comment":47,"blank":18},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/Akku/menuAkku.cpp":{"language":"C++","code":48,"comment":10,"blank":12},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/GPS/menuGPS.cpp":{"language":"C++","code":159,"comment":10,"blank":23},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/PID/menuPidSettings.h":{"language":"C++","code":23,"comment":43,"blank":16},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/PID/menuPidSettings.cpp":{"language":"C++","code":65,"comment":10,"blank":19},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Times/debugTimes.h":{"language":"C++","code":19,"comment":40,"blank":13},"file:///c%3A/Users/alex1/git/projektarbeit/lib/NtripClient/ntripClient.h":{"language":"C++","code":50,"comment":0,"blank":16},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/Akku/menuAkku.h":{"language":"C++","code":22,"comment":31,"blank":12},"file:///c%3A/Users/alex1/git/projektarbeit/include/networkConfig.h":{"language":"C++","code":97,"comment":37,"blank":17},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Times/debugTimes.cpp":{"language":"C++","code":28,"comment":10,"blank":9},"file:///c%3A/Users/alex1/git/projektarbeit/lib/NtripClient/ntripClient.cpp":{"language":"C++","code":186,"comment":22,"blank":42},"file:///c%3A/Users/alex1/git/projektarbeit/include/moveControl.h":{"language":"C++","code":54,"comment":102,"blank":23},"file:///c%3A/Users/alex1/git/projektarbeit/src/OutputBuf/outputBuf.h":{"language":"C++","code":24,"comment":32,"blank":12},"file:///c%3A/Users/alex1/git/projektarbeit/src/network.cpp":{"language":"C++","code":86,"comment":16,"blank":17},"file:///c%3A/Users/alex1/git/projektarbeit/src/moveControl.cpp":{"language":"C++","code":133,"comment":35,"blank":34},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp":{"language":"C++","code":69,"comment":11,"blank":14},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h":{"language":"C++","code":16,"comment":31,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.h":{"language":"C++","code":20,"comment":22,"blank":8},"file:///c%3A/Users/alex1/git/projektarbeit/src/main.cpp":{"language":"C++","code":227,"comment":38,"blank":43},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Speedometer/speedometer.h":{"language":"C++","code":35,"comment":68,"blank":22},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/menuDriveMode.cpp":{"language":"C++","code":13,"comment":10,"blank":5},"file:///c%3A/Users/alex1/git/projektarbeit/debugMqtt/rhede/main_debug.py":{"language":"Python","code":13,"comment":2,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h":{"language":"C++","code":14,"comment":31,"blank":8},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Speedometer/speedometer.cpp":{"language":"C++","code":81,"comment":12,"blank":21},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp":{"language":"C++","code":25,"comment":10,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/debugMqtt/rhede/main.py":{"language":"Python","code":16,"comment":2,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.h":{"language":"C++","code":37,"comment":10,"blank":11},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp":{"language":"C++","code":12,"comment":10,"blank":3},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h":{"language":"C++","code":9,"comment":27,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp":{"language":"C++","code":115,"comment":23,"blank":29},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/driveModi.h":{"language":"C++","code":10,"comment":22,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Navigation/navigation.cpp":{"language":"C++","code":178,"comment":28,"blank":40},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/driveManager.h":{"language":"C++","code":41,"comment":69,"blank":17},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/driveManager.cpp":{"language":"C++","code":63,"comment":13,"blank":21},"file:///c%3A/Users/alex1/git/projektarbeit/debugMqtt/hw1/main_debug.py":{"language":"Python","code":12,"comment":2,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/debugMqtt/hw1/main.py":{"language":"Python","code":14,"comment":2,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Navigation/route.cpp":{"language":"C++","code":28,"comment":10,"blank":8},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.h":{"language":"C++","code":22,"comment":49,"blank":12},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/Racing/racing.cpp":{"language":"C++","code":0,"comment":0,"blank":1},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/Racing/racing.h":{"language":"C++","code":0,"comment":0,"blank":1},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/ManualControl/manualControl.cpp":{"language":"C++","code":25,"comment":10,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Navigation/navigation.h":{"language":"C++","code":53,"comment":119,"blank":29},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/TestMode/testMode.cpp":{"language":"C++","code":99,"comment":14,"blank":28},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/TestMode/testMode.h":{"language":"C++","code":26,"comment":10,"blank":14},"file:///c%3A/Users/alex1/git/projektarbeit/lib/MQTT/debugMqtt.h":{"language":"C++","code":41,"comment":120,"blank":18},"file:///c%3A/Users/alex1/git/projektarbeit/lib/MQTT/debugMqtt.cpp":{"language":"C++","code":81,"comment":12,"blank":17},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.h":{"language":"C++","code":6,"comment":10,"blank":5},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/ConsolControl/consolControl.cpp":{"language":"C++","code":1,"comment":10,"blank":3},"file:///c%3A/Users/alex1/git/projektarbeit/lib/MotorControl/motorControl.h":{"language":"C++","code":47,"comment":102,"blank":22},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.h":{"language":"C++","code":21,"comment":51,"blank":13},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/CaptureRoute/captureRoute.cpp":{"language":"C++","code":29,"comment":10,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/Autopilot/autopilotConfig.h":{"language":"C++","code":9,"comment":36,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/lib/MotorControl/motorControl.cpp":{"language":"C++","code":144,"comment":24,"blank":35},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Navigation/route.h":{"language":"C++","code":34,"comment":74,"blank":20},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.h":{"language":"C++","code":34,"comment":82,"blank":19},"file:///c%3A/Users/alex1/git/projektarbeit/src/driveModi/Modi/Autopilot/autopilot.cpp":{"language":"C++","code":73,"comment":11,"blank":20},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menuIntInput.h":{"language":"C++","code":46,"comment":34,"blank":20},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menuIntInput.cpp":{"language":"C++","code":170,"comment":14,"blank":41},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menuControl.h":{"language":"C++","code":22,"comment":44,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menuAction.h":{"language":"C++","code":21,"comment":53,"blank":15},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menuAction.cpp":{"language":"C++","code":36,"comment":10,"blank":9},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Illumination/underfloorLighting.h":{"language":"C++","code":0,"comment":0,"blank":1},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menu.h":{"language":"C++","code":26,"comment":18,"blank":12},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Illumination/underfloorLighting.cpp":{"language":"C++","code":0,"comment":0,"blank":1},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Battery/battery.cpp":{"language":"C++","code":45,"comment":11,"blank":10},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Battery/battery.h":{"language":"C++","code":33,"comment":52,"blank":13},"file:///c%3A/Users/alex1/git/projektarbeit/lib/Menu/menu.cpp":{"language":"C++","code":106,"comment":11,"blank":19},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/details.md":{"language":"Markdown","code":71,"comment":0,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.md":{"language":"Markdown","code":44,"comment":0,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.md":{"language":"Markdown","code":39,"comment":0,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/results.json":{"language":"JSON","code":1,"comment":0,"blank":0},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/results.json":{"language":"JSON","code":1,"comment":0,"blank":0},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff.md":{"language":"Markdown","code":12,"comment":0,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/diff-details.md":{"language":"Markdown","code":9,"comment":0,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-01-19_11-26-30/details.md":{"language":"Markdown","code":60,"comment":0,"blank":6},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff.md":{"language":"Markdown","code":31,"comment":0,"blank":7},"file:///c%3A/Users/alex1/git/projektarbeit/.VSCodeCounter/2022-02-01_10-50-06/diff-details.md":{"language":"Markdown","code":52,"comment":0,"blank":6}} \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/results.md b/.VSCodeCounter/2022-12-09_11-39-58/results.md new file mode 100644 index 0000000..c30436a --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/results.md @@ -0,0 +1,64 @@ +# Summary + +Date : 2022-12-09 11:39:58 + +Directory c:\\Users\\alex1\\git\\projektarbeit + +Total : 84 files, 4279 codes, 1998 comments, 1138 blanks, all 7415 lines + +Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md) + +## Languages +| language | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| C++ | 67 | 3,354 | 1,981 | 1,026 | 6,361 | +| umlet | 2 | 531 | 0 | 17 | 548 | +| Markdown | 8 | 318 | 0 | 52 | 370 | +| Python | 4 | 55 | 8 | 40 | 103 | +| Ini | 1 | 19 | 9 | 3 | 31 | +| JSON | 2 | 2 | 0 | 0 | 2 | + +## Directories +| path | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| . | 84 | 4,279 | 1,998 | 1,138 | 7,415 | +| .VSCodeCounter | 10 | 320 | 0 | 52 | 372 | +| .VSCodeCounter\\2022-01-19_11-26-30 | 5 | 121 | 0 | 26 | 147 | +| .VSCodeCounter\\2022-02-01_10-50-06 | 5 | 199 | 0 | 26 | 225 | +| debugMqtt | 4 | 55 | 8 | 40 | 103 | +| debugMqtt\\hw1 | 2 | 26 | 4 | 20 | 50 | +| debugMqtt\\rhede | 2 | 29 | 4 | 20 | 53 | +| doc | 2 | 531 | 0 | 17 | 548 | +| doc\\Diagrams | 2 | 531 | 0 | 17 | 548 | +| include | 5 | 204 | 228 | 60 | 492 | +| lib | 25 | 1,510 | 888 | 463 | 2,861 | +| lib\\Battery | 2 | 78 | 63 | 23 | 164 | +| lib\\Illumination | 2 | 0 | 0 | 2 | 2 | +| lib\\MQTT | 2 | 122 | 132 | 35 | 289 | +| lib\\Menu | 7 | 427 | 184 | 126 | 737 | +| lib\\MotorControl | 2 | 191 | 126 | 57 | 374 | +| lib\\Navigation | 4 | 293 | 231 | 97 | 621 | +| lib\\NtripClient | 2 | 236 | 22 | 58 | 316 | +| lib\\Speedometer | 2 | 116 | 80 | 43 | 239 | +| lib\\Times | 2 | 47 | 50 | 22 | 119 | +| src | 37 | 1,640 | 865 | 503 | 3,008 | +| src\\OutputBuf | 2 | 60 | 43 | 25 | 128 | +| src\\SpecialMenus | 16 | 675 | 336 | 200 | 1,211 | +| src\\SpecialMenus\\Akku | 2 | 70 | 41 | 24 | 135 | +| src\\SpecialMenus\\GPS | 2 | 187 | 57 | 41 | 285 | +| src\\SpecialMenus\\PID | 2 | 88 | 53 | 35 | 176 | +| src\\SpecialMenus\\driveModi | 10 | 330 | 185 | 100 | 615 | +| src\\SpecialMenus\\driveModi\\Autopilot | 2 | 85 | 42 | 24 | 151 | +| src\\SpecialMenus\\driveModi\\CaptureRoute | 2 | 39 | 41 | 14 | 94 | +| src\\SpecialMenus\\driveModi\\ManualDrive | 2 | 21 | 37 | 9 | 67 | +| src\\SpecialMenus\\driveModi\\TestMode | 2 | 152 | 33 | 40 | 225 | +| src\\driveModi | 16 | 459 | 397 | 184 | 1,040 | +| src\\driveModi\\Modi | 13 | 345 | 293 | 140 | 778 | +| src\\driveModi\\Modi\\Autopilot | 3 | 116 | 129 | 49 | 294 | +| src\\driveModi\\Modi\\CaptureRoute | 2 | 50 | 61 | 20 | 131 | +| src\\driveModi\\Modi\\ConsolControl | 2 | 7 | 20 | 8 | 35 | +| src\\driveModi\\Modi\\ManualControl | 2 | 47 | 59 | 19 | 125 | +| src\\driveModi\\Modi\\Racing | 2 | 0 | 0 | 2 | 2 | +| src\\driveModi\\Modi\\TestMode | 2 | 125 | 24 | 42 | 191 | + +Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2022-12-09_11-39-58/results.txt b/.VSCodeCounter/2022-12-09_11-39-58/results.txt new file mode 100644 index 0000000..8b50cc0 --- /dev/null +++ b/.VSCodeCounter/2022-12-09_11-39-58/results.txt @@ -0,0 +1,151 @@ +Date : 2022-12-09 11:39:58 +Directory : c:\Users\alex1\git\projektarbeit +Total : 84 files, 4279 codes, 1998 comments, 1138 blanks, all 7415 lines + +Languages ++----------+------------+------------+------------+------------+------------+ +| language | files | code | comment | blank | total | ++----------+------------+------------+------------+------------+------------+ +| C++ | 67 | 3,354 | 1,981 | 1,026 | 6,361 | +| umlet | 2 | 531 | 0 | 17 | 548 | +| Markdown | 8 | 318 | 0 | 52 | 370 | +| Python | 4 | 55 | 8 | 40 | 103 | +| Ini | 1 | 19 | 9 | 3 | 31 | +| JSON | 2 | 2 | 0 | 0 | 2 | ++----------+------------+------------+------------+------------+------------+ + +Directories ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| path | files | code | comment | blank | total | ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| . | 84 | 4,279 | 1,998 | 1,138 | 7,415 | +| .VSCodeCounter | 10 | 320 | 0 | 52 | 372 | +| .VSCodeCounter\2022-01-19_11-26-30 | 5 | 121 | 0 | 26 | 147 | +| .VSCodeCounter\2022-02-01_10-50-06 | 5 | 199 | 0 | 26 | 225 | +| debugMqtt | 4 | 55 | 8 | 40 | 103 | +| debugMqtt\hw1 | 2 | 26 | 4 | 20 | 50 | +| debugMqtt\rhede | 2 | 29 | 4 | 20 | 53 | +| doc | 2 | 531 | 0 | 17 | 548 | +| doc\Diagrams | 2 | 531 | 0 | 17 | 548 | +| include | 5 | 204 | 228 | 60 | 492 | +| lib | 25 | 1,510 | 888 | 463 | 2,861 | +| lib\Battery | 2 | 78 | 63 | 23 | 164 | +| lib\Illumination | 2 | 0 | 0 | 2 | 2 | +| lib\MQTT | 2 | 122 | 132 | 35 | 289 | +| lib\Menu | 7 | 427 | 184 | 126 | 737 | +| lib\MotorControl | 2 | 191 | 126 | 57 | 374 | +| lib\Navigation | 4 | 293 | 231 | 97 | 621 | +| lib\NtripClient | 2 | 236 | 22 | 58 | 316 | +| lib\Speedometer | 2 | 116 | 80 | 43 | 239 | +| lib\Times | 2 | 47 | 50 | 22 | 119 | +| src | 37 | 1,640 | 865 | 503 | 3,008 | +| src\OutputBuf | 2 | 60 | 43 | 25 | 128 | +| src\SpecialMenus | 16 | 675 | 336 | 200 | 1,211 | +| src\SpecialMenus\Akku | 2 | 70 | 41 | 24 | 135 | +| src\SpecialMenus\GPS | 2 | 187 | 57 | 41 | 285 | +| src\SpecialMenus\PID | 2 | 88 | 53 | 35 | 176 | +| src\SpecialMenus\driveModi | 10 | 330 | 185 | 100 | 615 | +| src\SpecialMenus\driveModi\Autopilot | 2 | 85 | 42 | 24 | 151 | +| src\SpecialMenus\driveModi\CaptureRoute | 2 | 39 | 41 | 14 | 94 | +| src\SpecialMenus\driveModi\ManualDrive | 2 | 21 | 37 | 9 | 67 | +| src\SpecialMenus\driveModi\TestMode | 2 | 152 | 33 | 40 | 225 | +| src\driveModi | 16 | 459 | 397 | 184 | 1,040 | +| src\driveModi\Modi | 13 | 345 | 293 | 140 | 778 | +| src\driveModi\Modi\Autopilot | 3 | 116 | 129 | 49 | 294 | +| src\driveModi\Modi\CaptureRoute | 2 | 50 | 61 | 20 | 131 | +| src\driveModi\Modi\ConsolControl | 2 | 7 | 20 | 8 | 35 | +| src\driveModi\Modi\ManualControl | 2 | 47 | 59 | 19 | 125 | +| src\driveModi\Modi\Racing | 2 | 0 | 0 | 2 | 2 | +| src\driveModi\Modi\TestMode | 2 | 125 | 24 | 42 | 191 | ++-----------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+ + +Files ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ +| filename | language | code | comment | blank | total | ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\details.md | Markdown | 60 | 0 | 6 | 66 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\diff-details.md | Markdown | 9 | 0 | 6 | 15 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\diff.md | Markdown | 12 | 0 | 7 | 19 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\results.json | JSON | 1 | 0 | 0 | 1 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-01-19_11-26-30\results.md | Markdown | 39 | 0 | 7 | 46 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\details.md | Markdown | 71 | 0 | 6 | 77 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff-details.md | Markdown | 52 | 0 | 6 | 58 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\diff.md | Markdown | 31 | 0 | 7 | 38 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.json | JSON | 1 | 0 | 0 | 1 | +| c:\Users\alex1\git\projektarbeit\.VSCodeCounter\2022-02-01_10-50-06\results.md | Markdown | 44 | 0 | 7 | 51 | +| c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main.py | Python | 14 | 2 | 10 | 26 | +| c:\Users\alex1\git\projektarbeit\debugMqtt\hw1\main_debug.py | Python | 12 | 2 | 10 | 24 | +| c:\Users\alex1\git\projektarbeit\debugMqtt\rhede\main.py | Python | 16 | 2 | 10 | 28 | +| c:\Users\alex1\git\projektarbeit\debugMqtt\rhede\main_debug.py | Python | 13 | 2 | 10 | 25 | +| c:\Users\alex1\git\projektarbeit\doc\Diagrams\classdiagramm.uxf | umlet | 142 | 0 | 15 | 157 | +| c:\Users\alex1\git\projektarbeit\doc\Diagrams\statesAutopilot.uxf | umlet | 389 | 0 | 2 | 391 | +| c:\Users\alex1\git\projektarbeit\include\config.h | C++ | 5 | 15 | 2 | 22 | +| c:\Users\alex1\git\projektarbeit\include\moveControl.h | C++ | 54 | 102 | 23 | 179 | +| c:\Users\alex1\git\projektarbeit\include\moveControlConfig.h | C++ | 23 | 18 | 4 | 45 | +| c:\Users\alex1\git\projektarbeit\include\network.h | C++ | 25 | 56 | 14 | 95 | +| c:\Users\alex1\git\projektarbeit\include\networkConfig.h | C++ | 97 | 37 | 17 | 151 | +| c:\Users\alex1\git\projektarbeit\lib\Battery\battery.cpp | C++ | 45 | 11 | 10 | 66 | +| c:\Users\alex1\git\projektarbeit\lib\Battery\battery.h | C++ | 33 | 52 | 13 | 98 | +| c:\Users\alex1\git\projektarbeit\lib\Illumination\underfloorLighting.cpp | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\lib\Illumination\underfloorLighting.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.cpp | C++ | 81 | 12 | 17 | 110 | +| c:\Users\alex1\git\projektarbeit\lib\MQTT\debugMqtt.h | C++ | 41 | 120 | 18 | 179 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menu.cpp | C++ | 106 | 11 | 19 | 136 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menu.h | C++ | 26 | 18 | 12 | 56 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.cpp | C++ | 36 | 10 | 9 | 55 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuAction.h | C++ | 21 | 53 | 15 | 89 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuControl.h | C++ | 22 | 44 | 10 | 76 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.cpp | C++ | 170 | 14 | 41 | 225 | +| c:\Users\alex1\git\projektarbeit\lib\Menu\menuIntInput.h | C++ | 46 | 34 | 20 | 100 | +| c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.cpp | C++ | 144 | 24 | 35 | 203 | +| c:\Users\alex1\git\projektarbeit\lib\MotorControl\motorControl.h | C++ | 47 | 102 | 22 | 171 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.cpp | C++ | 178 | 28 | 40 | 246 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\navigation.h | C++ | 53 | 119 | 29 | 201 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\route.cpp | C++ | 28 | 10 | 8 | 46 | +| c:\Users\alex1\git\projektarbeit\lib\Navigation\route.h | C++ | 34 | 74 | 20 | 128 | +| c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.cpp | C++ | 186 | 22 | 42 | 250 | +| c:\Users\alex1\git\projektarbeit\lib\NtripClient\ntripClient.h | C++ | 50 | 0 | 16 | 66 | +| c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.cpp | C++ | 81 | 12 | 21 | 114 | +| c:\Users\alex1\git\projektarbeit\lib\Speedometer\speedometer.h | C++ | 35 | 68 | 22 | 125 | +| c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.cpp | C++ | 28 | 10 | 9 | 47 | +| c:\Users\alex1\git\projektarbeit\lib\Times\debugTimes.h | C++ | 19 | 40 | 13 | 72 | +| c:\Users\alex1\git\projektarbeit\platformio.ini | Ini | 19 | 9 | 3 | 31 | +| c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.cpp | C++ | 36 | 11 | 13 | 60 | +| c:\Users\alex1\git\projektarbeit\src\OutputBuf\outputBuf.h | C++ | 24 | 32 | 12 | 68 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.cpp | C++ | 48 | 10 | 12 | 70 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\Akku\menuAkku.h | C++ | 22 | 31 | 12 | 65 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.cpp | C++ | 159 | 10 | 23 | 192 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\GPS\menuGPS.h | C++ | 28 | 47 | 18 | 93 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.cpp | C++ | 65 | 10 | 19 | 94 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\PID\menuPidSettings.h | C++ | 23 | 43 | 16 | 82 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.cpp | C++ | 69 | 11 | 14 | 94 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\Autopilot\menuAutopilot.h | C++ | 16 | 31 | 10 | 57 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.cpp | C++ | 25 | 10 | 6 | 41 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\CaptureRoute\menuCaptureRoute.h | C++ | 14 | 31 | 8 | 53 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.cpp | C++ | 12 | 10 | 3 | 25 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\ManualDrive\menuManualDrive.h | C++ | 9 | 27 | 6 | 42 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.cpp | C++ | 115 | 23 | 29 | 167 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\TestMode\menuTestMode.h | C++ | 37 | 10 | 11 | 58 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.cpp | C++ | 13 | 10 | 5 | 28 | +| c:\Users\alex1\git\projektarbeit\src\SpecialMenus\driveModi\menuDriveMode.h | C++ | 20 | 22 | 8 | 50 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.cpp | C++ | 73 | 11 | 20 | 104 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilot.h | C++ | 34 | 82 | 19 | 135 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Autopilot\autopilotConfig.h | C++ | 9 | 36 | 10 | 55 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.cpp | C++ | 29 | 10 | 7 | 46 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\CaptureRoute\captureRoute.h | C++ | 21 | 51 | 13 | 85 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.cpp | C++ | 1 | 10 | 3 | 14 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ConsolControl\consolControl.h | C++ | 6 | 10 | 5 | 21 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.cpp | C++ | 25 | 10 | 7 | 42 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\ManualControl\manualControl.h | C++ | 22 | 49 | 12 | 83 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.cpp | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\Racing\racing.h | C++ | 0 | 0 | 1 | 1 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.cpp | C++ | 99 | 14 | 28 | 141 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\Modi\TestMode\testMode.h | C++ | 26 | 10 | 14 | 50 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.cpp | C++ | 63 | 13 | 21 | 97 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveManager.h | C++ | 41 | 69 | 17 | 127 | +| c:\Users\alex1\git\projektarbeit\src\driveModi\driveModi.h | C++ | 10 | 22 | 6 | 38 | +| c:\Users\alex1\git\projektarbeit\src\main.cpp | C++ | 227 | 38 | 43 | 308 | +| c:\Users\alex1\git\projektarbeit\src\moveControl.cpp | C++ | 133 | 35 | 34 | 202 | +| c:\Users\alex1\git\projektarbeit\src\network.cpp | C++ | 86 | 16 | 17 | 119 | +| Total | | 4,279 | 1,998 | 1,138 | 7,415 | ++-----------------------------------------------------------------------------------------------+----------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/doc/Notes and TODOs/SPIpushRawData.txt b/doc/Notes and TODOs/SPIpushRawData.txt new file mode 100644 index 0000000..3bd1e86 --- /dev/null +++ b/doc/Notes and TODOs/SPIpushRawData.txt @@ -0,0 +1,9 @@ +Added this code in SparkFun_u-blox_GNSS_Arduino_Libary.cpp in the function pushRawData. + +_spiPort->beginTransaction(SPISettings(_spiSpeed, MSBFIRST, SPI_MODE0)); +digitalWrite(_csPin, LOW); +for (uint16_t i = 0; i < numDataBytes; i++) { + spiTransfer(dataBytes[i]); +} +digitalWrite(_csPin, HIGH); +_spiPort->endTransaction(); diff --git a/doc/PinBelegungen.txt b/doc/PinBelegungen.txt index 0350210..5235553 100644 --- a/doc/PinBelegungen.txt +++ b/doc/PinBelegungen.txt @@ -9,12 +9,12 @@ AKKU 35 21 SDA SDA INTL1 32 GND GND INTL2 33 19 SCL SCL INTB1 25 18 VCC -INTB2 26 5 +INTB2 26 5 SPI_CSK DirL1 27 17 SPI_CS DirR2 14 16 SPI_COPI DirL2 12 4 SPI_CIPO GND x -PWML 13 2 SPI_SCK +PWML 13 2 Probleme beim flashen x 15 WS2812 LED ? x x CMD x diff --git a/include/config.h b/include/config.h index f155137..5cd7e31 100644 --- a/include/config.h +++ b/include/config.h @@ -18,4 +18,4 @@ #define UBLOX_GNSS_SPI_CS 17 #define UBLOX_GNSS_SPI_COPI 16 #define UBLOX_GNSS_SPI_CIPO 4 -#define UBLOX_GNSS_SPI_SCK 2 +#define UBLOX_GNSS_SPI_SCK 5 diff --git a/include/networkConfig.h b/include/networkConfig.h index c84be92..c795b28 100644 --- a/include/networkConfig.h +++ b/include/networkConfig.h @@ -46,7 +46,7 @@ #ifdef NTRIP_NS #define NTRIP_HOST "openservice-sapos.niedersachsen.de" #define NTRIP_PORT 2101 -#define NTRIP_MOUNT_POINT "VRS_3_4G_NI" +#define NTRIP_MOUNT_POINT "VRS_3_2G_NI" #define NTRIP_USER "ni_FHDo01" #define NTRIP_PASSWORD "ALdx-1-3e49" #endif // NTRIP_NS @@ -55,8 +55,8 @@ #ifdef NTRIP_RTK2GO #define NTRIP_HOST "rtk2go.com" #define NTRIP_PORT 2101 -#define NTRIP_MOUNT_POINT "Blijham" -#define NTRIP_USER "alex17813@gmail.com" +#define NTRIP_MOUNT_POINT "uithuizermeeden" +#define NTRIP_USER "alklein1@gmx.de" #define NTRIP_PASSWORD "none" #endif // NTRIP_RTK2GO diff --git a/lib/Navigation/navigation.cpp b/lib/Navigation/navigation.cpp index b719b29..588c2f1 100644 --- a/lib/Navigation/navigation.cpp +++ b/lib/Navigation/navigation.cpp @@ -11,6 +11,8 @@ #include "navigation.h" +bool Navigation::outputStatusPrintPVTdata = false; + Navigation::Navigation(Route* route) { this->gps = new SFE_UBLOX_GNSS(); if (this->gps->begin() == false) { @@ -20,9 +22,9 @@ Navigation::Navigation(Route* route) { this->init(route); } -Navigation::Navigation(SPIClass spiPort, uint8_t csPin, Route* route) { +Navigation::Navigation(SPIClass* spiPort, uint8_t csPin, Route* route) { this->gps = new SFE_UBLOX_GNSS(); - if (this->gps->begin(spiPort, csPin, 4000000) == false) { + if (this->gps->begin(*spiPort, csPin, 4000000) == false) { std::cout << "u-blox GNSS not detected on SPI bus. Please check wiring. Freezing." << std::endl; while (1); } @@ -34,10 +36,17 @@ void Navigation::init(Route* route) { uint8_t versionLow = this->gps->getProtocolVersionLow(); std::cout << "u-blox protocol version: " << unsigned(versionHigh) << "." << unsigned(versionLow) << std::endl; - this->gps->setI2COutput(COM_TYPE_UBX); - this->gps->setUSBOutput(COM_TYPE_UBX | COM_TYPE_NMEA); + // std::cout << "Set GNSS Module to factory settings... "; + // this->gps->factoryReset(); + // delay(5000); + // std::cout << "Complete" << std::endl; + this->gps->setSPIOutput(COM_TYPE_UBX); + this->gps->setUSBOutput(COM_TYPE_UBX | COM_TYPE_NMEA); + this->gps->setAutoPVTcallbackPtr(&(Navigation::printPVTdata)); + // Navigation::setOutputStatusPrintPVTdata(true); this->gps->setNavigationFrequency(1); + this->gps->setAutoPVT(true); if (route) this->route = route; @@ -64,13 +73,32 @@ void Navigation::initNtrip(String host, uint16_t port, String mountPoint, String } void Navigation::loop() { - //FIXME: Hier sollte funktion zum aktualisieren des GPS Moduls stehen + static uint32_t lastTime = 0; - if (millis() - this->lastMillis < this->timeToWait) - return; + this->gps->checkCallbacks(); + if (this->gps->getPVT() && this->gps->getGnssFixOk()) { + this->updateCurrentLocation(); + std::cout << "duration between: " << millis() - lastTime << std::endl; + lastTime = millis(); + } else if (millis() - lastTime > 20000) { + std::cout << "Keine Daten mehr!" << std::endl; + this->gps->flushPVT(); + this->gps->softwareResetGNSSOnly(); + lastTime = millis(); + + // std::cout + // << "checkUblox: " << this->gps->checkUblox() << " -|- " + // << "getGnssFixOk: " << this->gps->getGnssFixOk() << " -|- " + // << "getHWstatus: " << this->gps->getHWstatus() << " -|- " + // << "isConnected: " << this->gps->isConnected() << " -|- " + // << std::endl; + } if (this->isNtripInit) this->ntripClient->loop(); + + if (millis() - this->lastMillis < this->timeToWait) + return; } void Navigation::newRoute() { @@ -90,9 +118,9 @@ bool Navigation::startNavigation() { CourseCorrection Navigation::getCourseCorrection() { CourseCorrection courseCorrection = {0, 0}; - Point currentPos = this->currentLocation(); - double targetCourse = Navigation::courseTo(currentPos, this->targetPoint); - double distance = Navigation::distanceBetween(currentPos, this->targetPoint); + this->updateCurrentLocation(); + double targetCourse = this->currentPosition.courseTo(this->targetPoint); + double distance = this->currentPosition.distanceTo(this->targetPoint); if (targetCourse < 0 || distance < 0 || this->navigationFinished) return courseCorrection; @@ -122,33 +150,32 @@ CourseCorrection Navigation::getCourseCorrection() { } bool Navigation::addCurrentPosToRoute() { - Point p = this->currentLocation(); - if (!p.isValid()) { return false; } + // FIXME: Should I use updateCurrentLocation here? think overall + this->updateCurrentLocation(); + if (!this->currentPosition.isValid()) { return false; } // First Point if (this->route->getRouteInfo().totalPoints == 0) { - this->route->addPointToRoute(p); - this->lastPoint = p; + this->route->addPointToRoute(this->currentPosition); + this->lastPoint = this->currentPosition; return true; } // Ever Point after the first - if (MIN_DISTANCE_BETWEEN_POINTS <= this->distanceBetween(p, this->lastPoint)) { - this->route->addPointToRoute(p); - this->lastPoint = p; + if (MIN_DISTANCE_BETWEEN_POINTS <= this->currentPosition.distanceTo(this->lastPoint)) { + this->route->addPointToRoute(this->currentPosition); + this->lastPoint = this->currentPosition; return true; } return false; } -Point Navigation::currentLocation() { - Point p; +void Navigation::updateCurrentLocation() { //TODO: check if the position is possible the true location if (this->gps) { - p.lat = this->gps->getLatitude(); - p.lon = this->gps->getLongitude(); + this->currentPosition.lat = this->gps->getLatitude(); + this->currentPosition.lon = this->gps->getLongitude(); } - return p; } bool Navigation::nextPoint() { @@ -166,14 +193,53 @@ bool Navigation::setTargetPoint(Point target) { return false; } -double Navigation::distanceBetween(Point p1, Point p2) { - if (p1.isValid() && p2.isValid()) - return NavigationUtils::distanceBetween(p1, p2); - return -1; +void Navigation::printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) { + if (!Navigation::outputStatusPrintPVTdata) + return; + + double latitude = (double) ubxDataStruct->lat / 10000000.0; + double longitude = (double) ubxDataStruct->lon / 10000000.0; + double altitude = (double) ubxDataStruct->hMSL / 1000.0; + + uint8_t fixType = ubxDataStruct->fixType; + char fixTypeString[32]; + if (fixType == 0) + strcpy(fixTypeString, "None"); + else if (fixType == 1) + strcpy(fixTypeString, "Dead Reckoning"); + else if (fixType == 2) + strcpy(fixTypeString, "2D"); + else if (fixType == 3) + strcpy(fixTypeString, "3D"); + else if (fixType == 3) + strcpy(fixTypeString, "GNSS + Dead Reckoning"); + else if (fixType == 5) + strcpy(fixTypeString, "Time Only"); + else + strcpy(fixTypeString, "UNKNOWN"); + + uint8_t carrSoln = ubxDataStruct->flags.bits.carrSoln; + char carrSolnString[16]; + if (carrSoln == 0) + strcpy(carrSolnString, "None"); + else if (carrSoln == 1) + strcpy(carrSolnString, "Floating"); + else if (carrSoln == 2) + strcpy(carrSolnString, "Fixed"); + else + strcpy(carrSolnString, "UNKNOWN"); + + uint32_t hAcc = ubxDataStruct->hAcc; + + std::cout << "Lat: " << latitude + << " Lng: " << longitude + << " Alt: " << altitude << std::endl; + + std::cout << "Fix: " << fixTypeString + << " Carrier Solution: " << carrSolnString + << " Horizontal Accuracy Estimate: " << hAcc << " mm" << std::endl; } -double Navigation::courseTo(Point p1, Point p2) { - if (p1.isValid() && p2.isValid()) - return NavigationUtils::courseTo(p1, p2); - return -1; +void Navigation::setOutputStatusPrintPVTdata(bool status) { + Navigation::outputStatusPrintPVTdata = status; } diff --git a/lib/Navigation/navigation.h b/lib/Navigation/navigation.h index 49bb6ad..6608ba3 100644 --- a/lib/Navigation/navigation.h +++ b/lib/Navigation/navigation.h @@ -18,7 +18,6 @@ #include #include "route.h" -#include "navigationUtils.h" #include "NTRIPClient.h" /** @@ -64,7 +63,7 @@ class Navigation { * * @param route with which to navigate */ - Navigation(SPIClass spiPort, uint8_t csPin, Route* route = nullptr); + Navigation(SPIClass* spiPort, uint8_t csPin, Route* route = nullptr); /** * @brief Destroy the Navigation object @@ -132,6 +131,8 @@ class Navigation { * @return SFE_UBLOX_GNSS* */ SFE_UBLOX_GNSS* getGPS() { return this->gps; } + static void printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct); + static void setOutputStatusPrintPVTdata(bool status); /** * @brief Returns the NTRIPClient object @@ -151,12 +152,7 @@ class Navigation { RouteInfo getRouteInfo() const { return this->route->getRouteInfo(); } private: - /** - * @brief Returns the current Location - * - * @return Point - */ - Point currentLocation(); + void updateCurrentLocation(); /** * @brief Set the next point as target @@ -175,24 +171,6 @@ class Navigation { */ bool setTargetPoint(Point target); - /** - * @brief Calculate the distance between to points - * - * @param p1 point 1 - * @param p2 point 2 - * @return double distance in meter - */ - static double distanceBetween(Point p1, Point p2); - - /** - * @brief Calculates the course from point1 to point2 - * - * @param p1 point 1 - * @param p2 point 2 - * @return double degree north = 0° west = 270° - */ - static double courseTo(Point p1, Point p2); - void init(Route* route); SFE_UBLOX_GNSS* gps; @@ -201,6 +179,7 @@ class Navigation { Point lastPoint; Point targetPoint; + Point currentPosition; bool navigationStarted = false; bool navigationFinished = false; @@ -211,9 +190,11 @@ class Navigation { char* user; char* password; - uint8_t timeToWait = 5; + uint8_t timeToWait = 200; uint16_t port; uint32_t lastMillis = 0; + + static bool outputStatusPrintPVTdata; }; #endif // NAVIGATION_H diff --git a/lib/Navigation/navigationUtils.cpp b/lib/Navigation/navigationUtils.cpp deleted file mode 100644 index e12ebc6..0000000 --- a/lib/Navigation/navigationUtils.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file navigationUtils.cpp - * @author Alexander Klein (alex@kleiax.de) - * @brief - * @version 0.1 - * @date 2022-03-24 - * - * @copyright Copyright (c) 2022 - * - */ - -#include "navigationUtils.h" - -double NavigationUtils::getCurrentCourse(Point p1) { - //TODO: write it!!! - return 0; -} - -void NavigationUtils::setLastPoint(Point p1) { - this->lastPoint = p1; -} - - -double NavigationUtils::courseTo(Point p1, Point p2) { - //TODO: write it!!! - return 0; -} - -double NavigationUtils::courseTo(double lat1, double lon1, double lat2, double lon2) { - return NavigationUtils::courseTo(Point(lat1, lon1), Point(lat2, lon2)); -} - -double NavigationUtils::distanceBetween(Point p1, Point p2) { - //TODO: write it!!! - return 0; -} - -double NavigationUtils::distanceBetween(double lat1, double lon1, double lat2, double lon2) { - return NavigationUtils::distanceBetween(Point(lat1, lon1), Point(lat2, lon2)); -} diff --git a/lib/Navigation/navigationUtils.h b/lib/Navigation/navigationUtils.h deleted file mode 100644 index 6742c0f..0000000 --- a/lib/Navigation/navigationUtils.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file navigationUtils.h - * @author Alexander Klein (alex@kleiax.de) - * @version 0.1 - * @date 2022-03-24 - * - * @copyright Copyright (c) 2022 - * - */ - -#ifndef NAVIGATION_UTILS_H -#define NAVIGATION_UTILS_H - -#include "route.h" - -class NavigationUtils { - public: - double getCurrentCourse(Point p1); - void setLastPoint(Point p1); - - static double courseTo(Point p1, Point p2); - static double courseTo(double lat1, double lon1, double lat2, double lon2); - static double distanceBetween(Point p1, Point p2); - static double distanceBetween(double lat1, double lon1, double lat2, double lon2); - - private: - Point lastPoint; -}; - -#endif // NAVIGATION_UTILS_H diff --git a/lib/Navigation/route.h b/lib/Navigation/route.h index 46e9565..4e609d5 100644 --- a/lib/Navigation/route.h +++ b/lib/Navigation/route.h @@ -54,6 +54,10 @@ class Point{ * @return false */ bool isValid() const { return this->lat + this->lon; } + + // FIXME: Add real implementations! + double distanceTo(const Point& point) const { return 0; } + double courseTo(const Point& point) const { return 0; } }; /** diff --git a/lib/NtripClient/ntripClient.cpp b/lib/NtripClient/ntripClient.cpp index 97b37ab..aff8bc6 100644 --- a/lib/NtripClient/ntripClient.cpp +++ b/lib/NtripClient/ntripClient.cpp @@ -10,7 +10,6 @@ */ #include "ntripClient.h" -bool NTRIPClient::outputStatusPrintPVTdata = false; NTRIPClient::NTRIPClient(SFE_UBLOX_GNSS* gps, const char* host, uint16_t port, const char* mountPoint, const char* user, const char* password) { this->gps = gps; @@ -32,9 +31,6 @@ void NTRIPClient::loop() { return; this->lastLoopTime = millis(); - this->gps->checkUblox(); - this->gps->checkCallbacks(); - if (millis() - this->lastGPGGAPushTime > this->pushGPGGATime && this->activated) { this->lastGPGGAPushTime = millis(); // std::cout << "Try to push GPGGA data." << std::endl; @@ -96,15 +92,12 @@ void NTRIPClient::loop() { } void NTRIPClient::gpsConfiguration() { - this->gps->setI2COutput(COM_TYPE_UBX | COM_TYPE_NMEA); - this->gps->setPortInput(COM_PORT_I2C, COM_TYPE_UBX | COM_TYPE_NMEA | COM_TYPE_RTCM3); + this->gps->setSPIOutput(COM_TYPE_UBX | COM_TYPE_NMEA); + this->gps->setPortInput(COM_PORT_SPI, COM_TYPE_UBX | COM_TYPE_NMEA | COM_TYPE_RTCM3); // Set the differential mode - ambiguities are fixed whenever possible - this->gps->setDGNSSConfiguration(SFE_UBLOX_DGNSS_MODE_FIXED); - this->gps->setNavigationFrequency(1); + this->gps->setDGNSSConfiguration(SFE_UBLOX_DGNSS_MODE_FIXED); this->gps->setMainTalkerID(SFE_UBLOX_MAIN_TALKER_ID_GP); - this->gps->enableNMEAMessage(UBX_NMEA_GGA, COM_PORT_I2C, 10); - - this->gps->setAutoPVTcallbackPtr(&(NTRIPClient::printPVTdata)); + this->gps->enableNMEAMessage(UBX_NMEA_GGA, COM_PORT_SPI, 10); } bool NTRIPClient::beginClient() { @@ -249,58 +242,6 @@ void NTRIPClient::pushGPGGA(NMEA_GGA_data_t *nmeaData) { std::cout << "Failed to pushing GGA to server: " << (const char *)nmeaData->nmea << std::endl; } -void NTRIPClient::printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) { - if (!NTRIPClient::outputStatusPrintPVTdata) - return; - - double latitude = (double) ubxDataStruct->lat / 10000000.0; - double longitude = (double) ubxDataStruct->lon / 10000000.0; - double altitude = (double) ubxDataStruct->hMSL / 1000.0; - - uint8_t fixType = ubxDataStruct->fixType; - char fixTypeString[32]; - if (fixType == 0) - strcpy(fixTypeString, "None"); - else if (fixType == 1) - strcpy(fixTypeString, "Dead Reckoning"); - else if (fixType == 2) - strcpy(fixTypeString, "2D"); - else if (fixType == 3) - strcpy(fixTypeString, "3D"); - else if (fixType == 3) - strcpy(fixTypeString, "GNSS + Dead Reckoning"); - else if (fixType == 5) - - strcpy(fixTypeString, "Time Only"); - else - strcpy(fixTypeString, "UNKNOWN"); - - uint8_t carrSoln = ubxDataStruct->flags.bits.carrSoln; - char carrSolnString[16]; - if (carrSoln == 0) - strcpy(carrSolnString, "None"); - else if (carrSoln == 1) - strcpy(carrSolnString, "Floating"); - else if (carrSoln == 2) - strcpy(carrSolnString, "Fixed"); - else - strcpy(carrSolnString, "UNKNOWN"); - - uint32_t hAcc = ubxDataStruct->hAcc; - - std::cout << "Lat: " << latitude - << " Lng: " << longitude - << " Alt: " << altitude << std::endl; - - std::cout << "Fix: " << fixTypeString - << " Carrier Solution: " << carrSolnString - << " Horizontal Accuracy Estimate: " << hAcc << " mm" << std::endl; -} - -void NTRIPClient::setOutputStatusPrintPVTdata(bool status) { - NTRIPClient::outputStatusPrintPVTdata = status; -} - bool NTRIPClient::isConnected() { if (this->state == NTRIPClientStates::pushData) return true; diff --git a/lib/NtripClient/ntripClient.h b/lib/NtripClient/ntripClient.h index 85960f2..eb414c9 100644 --- a/lib/NtripClient/ntripClient.h +++ b/lib/NtripClient/ntripClient.h @@ -30,8 +30,7 @@ class NTRIPClient { bool isConnected(); NTRIPClientStates getClientState() { return this->state; } - static void printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct); - static void setOutputStatusPrintPVTdata(bool status); + private: void pushGPGGA(NMEA_GGA_data_t *nmeaData); @@ -61,8 +60,6 @@ class NTRIPClient { const uint16_t tryReconnectTime = 5000; const uint16_t bufferSize = 512; const uint16_t pushGPGGATime = 10000; - - static bool outputStatusPrintPVTdata; }; #endif diff --git a/lib/Times/debugTimes.cpp b/lib/Times/debugTimes.cpp index a229ab6..823a678 100644 --- a/lib/Times/debugTimes.cpp +++ b/lib/Times/debugTimes.cpp @@ -10,14 +10,15 @@ */ #include "debugTimes.h" +bool DebugTimes::print = false; +bool DebugTimes::printWarning = true; + DebugTimes::DebugTimes() { this->startTime = millis(); - static bool firstInstance = true; - if (firstInstance) { - firstInstance = false; - if (!DebugTimes::print) - std::cout << std::endl << "Warning: DebugTimes is muuted, no times are be shown." << std::endl << std::endl; + if (!DebugTimes::printWarning) { + std::cout << std::endl << "Warning: DebugTimes is muuted, no times are be shown." << std::endl << std::endl; + DebugTimes::printWarning = false; } } @@ -35,3 +36,11 @@ uint16_t DebugTimes::stopConsol(const char* name, uint16_t minTime) { std::cout << name << " needs " << time << " ms" << std::endl; return time; } + +void DebugTimes::setConsolOutput(bool enable) { + if (enable == DebugTimes::print) + return; + + DebugTimes::print = enable; + DebugTimes::printWarning = !enable; +} diff --git a/lib/Times/debugTimes.h b/lib/Times/debugTimes.h index 1f7e8f1..cd15521 100644 --- a/lib/Times/debugTimes.h +++ b/lib/Times/debugTimes.h @@ -59,10 +59,13 @@ class DebugTimes { */ uint16_t stopConsol(const char* name, uint16_t minTime = 0); + static void setConsolOutput(bool enable); + private: uint64_t startTime; - static const bool print = false; + static bool print; + static bool printWarning; }; #endif //DEBUG_TIMES_H diff --git a/src/SpecialMenus/GPS/menuGPS.cpp b/src/SpecialMenus/GPS/menuGPS.cpp index 8bffb6e..329d294 100644 --- a/src/SpecialMenus/GPS/menuGPS.cpp +++ b/src/SpecialMenus/GPS/menuGPS.cpp @@ -64,12 +64,12 @@ void MenuGPS::update() { } void MenuGPS::printPage() const { - uint8_t fixType = gps->getFixType(); + uint8_t fixType = this->gps->getFixType(); switch (this->currentPage) { case 0: { - uint8_t siv = gps->getSIV(); - uint16_t hdop = gps->getHorizontalDOP(); + uint8_t siv = this->gps->getSIV(); + uint16_t hdop = this->gps->getHorizontalDOP(); if (this->lcd) { lcd->clear(); lcd->setCursor(0, 0); @@ -88,12 +88,12 @@ void MenuGPS::printPage() const { << " HDOP: " << (int) hdop << std::endl; else std::cout << "Data isn't valid or no GPS signal" << std::endl; - } + } break; case 1: { - int32_t lat = gps->getLatitude(); - int32_t lng = gps->getLongitude(); + int32_t lat = this->gps->getLatitude(); + int32_t lng = this->gps->getLongitude(); if (this->lcd) { lcd->clear(); lcd->setCursor(0, 0); @@ -112,11 +112,11 @@ void MenuGPS::printPage() const { << " Lng: " << lng << std::endl; else std::cout << "Data isn't valid or NO GPS signal" << std::endl; - } + } break; case 2: { - uint32_t unixEpoch = gps->getUnixEpoch(); + uint32_t unixEpoch = this->gps->getUnixEpoch(); if (this->lcd) { lcd->clear(); @@ -126,7 +126,7 @@ void MenuGPS::printPage() const { lcd->printf("-> %u", unixEpoch); } std::cout << "Unix Epoch: " << (int) unixEpoch << std::endl; - } + } break; case 3: { @@ -150,9 +150,24 @@ void MenuGPS::printPage() const { std::cout << "NTRIP Client is enabled." << std::endl; else std::cout << "NTRIP Client is disabled" << std::endl; - } + } break; + case 4: { + uint32_t accuracy = this->gps->getHorizontalAccuracy(); + + if (this->lcd) { + lcd->clear(); + lcd->setCursor(0, 0); + lcd->printf("Hrizntl Accuracy"); + lcd->setCursor(0, 1); + lcd->printf("-> %u", accuracy); + } + std::cout << "Horizontal Accuracy Estimate: " << (int) accuracy << std::endl; + } + break; + + default: if (this->lcd) { lcd->clear(); diff --git a/src/driveModi/driveManager.cpp b/src/driveModi/driveManager.cpp index 21dfcec..5269c01 100644 --- a/src/driveModi/driveManager.cpp +++ b/src/driveModi/driveManager.cpp @@ -18,8 +18,8 @@ Modi& operator++(Modi& m, int) { DriveManager::DriveManager(MoveControl *moveControl, bool wifi) { this->moveControl = moveControl; - SPIClass spiPort(HSPI); - spiPort.begin(UBLOX_GNSS_SPI_SCK, UBLOX_GNSS_SPI_CIPO, UBLOX_GNSS_SPI_COPI, UBLOX_GNSS_SPI_CS); + this->spiPort = new SPIClass(HSPI); + spiPort->begin(UBLOX_GNSS_SPI_SCK, UBLOX_GNSS_SPI_CIPO, UBLOX_GNSS_SPI_COPI, UBLOX_GNSS_SPI_CS); this->navigation = new Navigation(spiPort, UBLOX_GNSS_SPI_CS); if (wifi) this->navigation->initNtrip(NTRIP_HOST, NTRIP_PORT, NTRIP_MOUNT_POINT, NTRIP_USER, NTRIP_PASSWORD); @@ -29,6 +29,7 @@ DriveManager::DriveManager(MoveControl *moveControl, bool wifi) { DriveManager::~DriveManager() { delete this->navigation; + delete this->spiPort; } void DriveManager::loop() { diff --git a/src/driveModi/driveManager.h b/src/driveModi/driveManager.h index fdeae5e..59154fb 100644 --- a/src/driveModi/driveManager.h +++ b/src/driveModi/driveManager.h @@ -119,6 +119,7 @@ class DriveManager { MoveControl *moveControl; DriveModi *currentModusPtr = nullptr; Navigation* navigation; + SPIClass* spiPort; }; diff --git a/src/main.cpp b/src/main.cpp index 258ecf4..a56c3e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,6 +61,8 @@ void makeMenu(void); void setup() { Serial.begin(115200); + // DebugTimes::setConsolOutput(true); + DebugTimes setupTime; char wifiIndicator = 'X'; mainBattery = new Battery(35, 692000, 218500); @@ -79,12 +81,12 @@ void setup() { driveManager = new DriveManager(&moveController, wifiIsActive); if (wifiIsActive) { - const char* remoteHost = "www.google.com"; - std::cout << "Pinging host: " << remoteHost << std::endl; - if (Ping.ping(remoteHost)) - std::cout << "Ping successful..." << std::endl; - else - std::cout << "Ping failed. :/" << std::endl; + // const char* remoteHost = "www.google.com"; + // std::cout << "Pinging host: " << remoteHost << std::endl; + // if (Ping.ping(remoteHost)) + // std::cout << "Ping successful..." << std::endl; + // else + // std::cout << "Ping failed. :/" << std::endl; if (Network::checkMQTT()) { DebugMqtt::init(Network::getMqttClient(), Loglevel::debug); @@ -122,6 +124,8 @@ void setup() { lcd->print("Press PS-Button"); makeMenu(); + + setupTime.stopConsol("Setup"); } void loop() { @@ -131,7 +135,6 @@ void loop() { Network::checkMQTT(); wifiTime.stopConsol("WiFi-Time", 5); } - driveManager->loop(); DebugTimes mainBatteryTime;