From 028b82e81a5dabf690fae39b244b060b7a406966 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Tue, 12 Oct 2021 17:27:49 +0200 Subject: [PATCH] der commit --- src/config.h | 27 ++++++++++++++++++++------- src/main.cpp | 2 ++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/config.h b/src/config.h index c2fb8bb..2dc29cf 100644 --- a/src/config.h +++ b/src/config.h @@ -47,12 +47,12 @@ //MoveControl config #define RUN_MOVE_CONTROL_DELAY 30 // Normal 10 untested #define ACCELERATE_STEPS 1 -#define PID_LEFT_P 2 -#define PID_LEFT_I 5 -#define PID_LEFT_D 1 -#define PID_RIGHT_P 2 -#define PID_RIGHT_I 5 -#define PID_RIGHT_D 1 +#define PID_LEFT_P 40 +#define PID_LEFT_I 20 +#define PID_LEFT_D 10 +#define PID_RIGHT_P 40 +#define PID_RIGHT_I 20 +#define PID_RIGHT_D 10 #define PID_OUT_MIN -100 #define PID_OUT_MAX 100 #define PID_SAMPLETIME 30 @@ -65,7 +65,7 @@ // PS3 Controller // ESP32 MAC BL 24:62:AB:F2:4B:3A -#define VOERDE +#define TPMOBIL //Network config DORTMUND #ifdef DORTMUND @@ -113,6 +113,19 @@ #define NTP_SERVER 0x01b2a8c0 //192.168.178.1 #endif // VOERDE +//Network config TPMOBIL +#ifdef TPMOBIL +#define WLAN_SSID "TP-Mobil" +#define WLAN_PASSWORD "Punica-699" +#define WLAN_IP 0x0F01a8c0 //192.168.1.15 +#define WLAN_SUBNETMASK 0x00FFFFFF //255.255.255.0 +#define WLAN_GATEWAY 0x0101a8c0 //192.168.1.1 +#define MQTT_SERVER 0x0201a8c0 //192.168.1.2 +#define MQTT_PORT 1883 +#define MQTT_BUFFER_SITE 128 +#define NTP_SERVER 0x0201a8c0 //192.168.1.2 +#endif //TPMOBIL + // GPS config #define GPS_BAUD 9600 #define RUN_ROUTE_DELAY 330 diff --git a/src/main.cpp b/src/main.cpp index b9a11fd..f94a6b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -98,7 +98,9 @@ void setup() { manualControl.init(&moveController, &left_motor, &right_motor); captureRoute.init(&route, &moveController, &left_motor, &right_motor); autopilot.init(&route, &moveController); + Serial.println("main 1"); consolControl.init(&moveController); + Serial.println("main 2"); } void loop() {