supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-12-22 21:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Control updates

Browse source
This commit is contained in:
Mee2001 2021-06-15 00:51:46 +01:00
parent d4e14208e2
commit 5e95a8d860
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Control/src/main.cpp
View file

@ -23,10 +23,10 @@
#pragma endregion #pragma endregion
#pragma region Definitions eg pins #pragma region Definitions eg pins
#define RX1pin 18 // Pin 6 on expansion board, UART1 #define RX1pin 17 // Pin 6 on expansion board, UART1
#define TX1pin 5 // Pin 7 on expansion board, UART1 #define TX1pin 16 // Pin 7 on expansion board, UART1
#define RX2pin 17 // Pin 8 on expansion board, UART2 #define RX2pin 18 // Pin 8 on expansion board, UART2
#define TX2pin 16 // Pin 9 on expansion board, UART2 #define TX2pin 5 // Pin 9 on expansion board, UART2
#define RX3pin 14 // Pin 10 on expansion board, UART3 #define RX3pin 14 // Pin 10 on expansion board, UART3
#define TX3pin 4 // Pin 11 on expansion board, UART3 #define TX3pin 4 // Pin 11 on expansion board, UART3
#define RX4pin 15 // Pin 12 on expansion board, UART4 #define RX4pin 15 // Pin 12 on expansion board, UART4
@ -82,7 +82,7 @@ void setup()
Serial1.begin(9600, SERIAL_8N1, RX1pin, TX1pin); // Set up hardware UART1 (Connected to Drive) Serial1.begin(9600, SERIAL_8N1, RX1pin, TX1pin); // Set up hardware UART1 (Connected to Drive)
Serial2.begin(9600, SERIAL_8N1, RX2pin, TX2pin); // Set up hardware UART2 (Connected to Energy) Serial2.begin(9600, SERIAL_8N1, RX2pin, TX2pin); // Set up hardware UART2 (Connected to Energy)
Serial3.begin(9600, SWSERIAL_8N1, RX3pin, TX3pin); // Set up software UART3 (Connected to Vision) Serial3.begin(9600, SWSERIAL_8N1, RX3pin, TX3pin); // Set up software UART3 (Connected to Vision)
Serial4.begin(115200, SWSERIAL_8N1, RX4pin, TX4pin); // Set up software UART4 (Connected to Compass) Serial4.begin(9600, SWSERIAL_8N1, RX4pin, TX4pin); // Set up software UART4 (Connected to Compass)
// Set global variable startup values // Set global variable startup values
Status = CS_IDLE; Status = CS_IDLE;
@ -232,7 +232,7 @@ void loop()
} }
break; break;
} }
delay(500); // delay(500);
} }
void notFound(AsyncWebServerRequest *request) void notFound(AsyncWebServerRequest *request)
@ -430,7 +430,7 @@ void recvFromCompass()
{ {
if (Serial4.available()) if (Serial4.available())
{ {
DynamicJsonDocument rdoc(128); DynamicJsonDocument rdoc(1024);
deserializeJson(rdoc, Serial4); deserializeJson(rdoc, Serial4);
heading = rdoc["cH"]; heading = rdoc["cH"];
} }