kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into newSpeedometer

Browse Source
This commit is contained in:
kleiax
2023-02-18 13:32:10 +01:00
parent fa721acee5 5fe7edf353
commit 8bb38d560e
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio.ini
+1 -1
View File
@@ -27,7 +27,7 @@ lib_deps =
marian-craciunescu/ESP32Ping@^1.7
bblanchon/ArduinoJson@^6.20.0
mprograms/QMC5883LCompass@^1.1.1
https://git.kleiax.de/PlatformIO-Libs/Menu.git
https://git.kleiax.de/PlatformIO-Libs/Menu.git#v1.0
upload_port = COM3
[env:release]
src/driveModi/Modi/TestMode/testMode.h
+2 -2
View File
@@ -121,8 +121,8 @@ class TestMode : public DriveModi {
*/
bool getBusy() const { return this->busy; }
Maneuver getManeuver() const { return this->maneuver; }
Speedometer* getSpeedometerLeft() { this->moveControl->getSpeedometerLeft(); }
Speedometer* getSpeedometerRight() { this->moveControl->getSpeedometerRight(); }
Speedometer* getSpeedometerLeft() { return this->moveControl->getSpeedometerLeft(); }
Speedometer* getSpeedometerRight() { return this->moveControl->getSpeedometerRight(); }
private:
bool engineInit(int16_t powerPercentage, int16_t seconds);
src/main.cpp
+19 -20
View File
@@ -27,7 +27,7 @@
#include "driveModi/driveManager.h"
#include "OutputBuf/outputBuf.h"
#include "displayWrapper.h"
#include "LcdWrapper.h"
#include "moveControl.h"
#include "network.h"
#include "debugMqtt.h"
@@ -44,7 +44,6 @@
#include "SpecialMenus/PID/menuPidSettings.h"
#include "SpecialMenus/Route/menuRoute.h"
#include "SpecialMenus/GPS/menuGPS.h"
#include "SpecialMenus/Test/menuTest.h"
MoveControl moveController;
DriveManager* driveManager;
@@ -279,16 +278,16 @@ void makeMenu() {
// Set Menus on LCD
main_m->setLcd(lcdWrapper);
mode_m->setLcd(lcdWrapper);
pid_m->setLcd(LcdWrapper);
pidl_m->setLcd(LcdWrapper);
pidr_m->setLcd(LcdWrapper);
man_m->setLcd(LcdWrapper);
cap_m->setLcd(LcdWrapper);
auto_m->setLcd(LcdWrapper);
testM_m->setLcd(LcdWrapper);
gps_m->setLcd(LcdWrapper);
sys_m->setLcd(LcdWrapper);
rout_m->setLcd(LcdWrapper);
pid_m->setLcd(lcdWrapper);
pidl_m->setLcd(lcdWrapper);
pidr_m->setLcd(lcdWrapper);
man_m->setLcd(lcdWrapper);
cap_m->setLcd(lcdWrapper);
auto_m->setLcd(lcdWrapper);
testM_m->setLcd(lcdWrapper);
gps_m->setLcd(lcdWrapper);
sys_m->setLcd(lcdWrapper);
rout_m->setLcd(lcdWrapper);
// Entry for the main menu
@@ -338,17 +337,17 @@ void makeMenu() {
}
void restart(void) {
LcdWrapper->clear();
LcdWrapper->setCursor(0, 0);
LcdWrapper->print("Rebooting ...");
lcdWrapper->clear();
lcdWrapper->setCursor(0, 0);
lcdWrapper->print("Rebooting ...");
ESP.restart();
}
void disconnectController(void) {
disconnectPs3 = true;
LcdWrapper->clear();
LcdWrapper->setCursor(0, 0);
LcdWrapper->print("Controller is");
LcdWrapper->setCursor(0, 1);
LcdWrapper->print("disconnected.");
lcdWrapper->clear();
lcdWrapper->setCursor(0, 0);
lcdWrapper->print("Controller is");
lcdWrapper->setCursor(0, 1);
lcdWrapper->print("disconnected.");
}