diff --git a/SerialCOM/INSTRUCTIONS-PLUGIN.txt b/SerialCOM/INSTRUCTIONS-PLUGIN.txt index 6b69acd..a7ade70 100644 --- a/SerialCOM/INSTRUCTIONS-PLUGIN.txt +++ b/SerialCOM/INSTRUCTIONS-PLUGIN.txt @@ -1,6 +1,6 @@ BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- +------------------------------------------------------------------------------------------ #1 Select the Zipfile for your correct Engine: - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) @@ -16,15 +16,17 @@ BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) ----------------->DerivedDataCache ----------------->Intermidiate ----------------->Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") + |------>SERIALCOM_UExxx ----------------->Saved Your_Project.uproject - #3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. #4 Re-Start your Project. You are ready to use the plugin!!! +*5.0EA (Unreal Engine 5 is using the same binary as 4.27, but it will work. A warning message will show up telling you that the plugin is for 4.27, accept and continue) + + Enjoy it! diff --git a/SerialCOM/RELEASE_3-0-0.txt b/SerialCOM/RELEASE_v3.0.0.5.txt similarity index 90% rename from SerialCOM/RELEASE_3-0-0.txt rename to SerialCOM/RELEASE_v3.0.0.5.txt index 26158a4..8c61975 100644 --- a/SerialCOM/RELEASE_3-0-0.txt +++ b/SerialCOM/RELEASE_v3.0.0.5.txt @@ -1,7 +1,14 @@ -"Serial COM" v3.0.0 (Beta) RELEASE NOTES ----------------------------------------------------------------------------------------------------- +"Serial COM" v3.0.0.05 (Beta) RELEASE NOTES +-------------------------------------------------------------- + +- Small but significant change. Internally changed the function from "USerial" to "USerialCom" to avoid problems if another UE4Duino plugin is running at the same time. This change makes is to avoid any conflict with old functions and corruption of plugins. + + + +"Serial COM" v3.0.0.04 (Beta) RELEASE NOTES +-------------------------------------------------------------- Changes from "UE4Duino" 2.2.5 to "Serial COM" v3.0.0 (Beta) - The "Serial COM" 3.0.0 Plugin now works nativelley in Unreal Engine 4.27/4.26/4.24 (PARTIAL SUPPORT WITH UE 5EA*) without having to re-build the project and possibly not be able to re-build for the lack of missing SDK's requirements. diff --git a/SerialCOM/SERIALCOM/INSTRUCTIONS-PLUGIN.txt b/SerialCOM/SERIALCOM/INSTRUCTIONS-PLUGIN.txt deleted file mode 100644 index 6b69acd..0000000 --- a/SerialCOM/SERIALCOM/INSTRUCTIONS-PLUGIN.txt +++ /dev/null @@ -1,42 +0,0 @@ - -BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- - -#1 Select the Zipfile for your correct Engine: - - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) - - SERIALCOMUE426/SERIALCOM.zip (Unreal Engine 4.26) - - SERIALCOMUE427/SERIALCOM.zip (Unreal Engine 4.27) - - SERIALCOMUE5EA/SERIALCOM.zip (Unreal Engine 5.0 Early Access) - -#2 Unzip the correspondent Zip file into your project "Plugins" Folder. If doesn't exist, create one. ----------->Your_Project_Folder--> ------------------>Binaries ------------------>Config ------------------>Content ------------------>DerivedDataCache ------------------>Intermidiate ------------------>Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") ------------------>Saved -Your_Project.uproject - - -#3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. - -#4 Re-Start your Project. You are ready to use the plugin!!! - - -Enjoy it! - - -https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port/ - -For support and comments, -Discord: https://discord.ramiroslab.com -Github: https://github.reamiroslab.com -YouTube: https://youtube.ramiroslab.com - -Thank you! -Ramiro Montes De Oca, -Ramiro's Lab - diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE425/INSTRUCTIONS-PLUGIN.txt b/SerialCOM/SERIALCOM/SERIALCOMUE425/INSTRUCTIONS-PLUGIN.txt deleted file mode 100644 index 6b69acd..0000000 --- a/SerialCOM/SERIALCOM/SERIALCOMUE425/INSTRUCTIONS-PLUGIN.txt +++ /dev/null @@ -1,42 +0,0 @@ - -BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- - -#1 Select the Zipfile for your correct Engine: - - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) - - SERIALCOMUE426/SERIALCOM.zip (Unreal Engine 4.26) - - SERIALCOMUE427/SERIALCOM.zip (Unreal Engine 4.27) - - SERIALCOMUE5EA/SERIALCOM.zip (Unreal Engine 5.0 Early Access) - -#2 Unzip the correspondent Zip file into your project "Plugins" Folder. If doesn't exist, create one. ----------->Your_Project_Folder--> ------------------>Binaries ------------------>Config ------------------>Content ------------------>DerivedDataCache ------------------>Intermidiate ------------------>Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") ------------------>Saved -Your_Project.uproject - - -#3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. - -#4 Re-Start your Project. You are ready to use the plugin!!! - - -Enjoy it! - - -https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port/ - -For support and comments, -Discord: https://discord.ramiroslab.com -Github: https://github.reamiroslab.com -YouTube: https://youtube.ramiroslab.com - -Thank you! -Ramiro Montes De Oca, -Ramiro's Lab - diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE427/INSTRUCTIONS-PLUGIN.txt b/SerialCOM/SERIALCOM/SERIALCOMUE427/INSTRUCTIONS-PLUGIN.txt deleted file mode 100644 index 6b69acd..0000000 --- a/SerialCOM/SERIALCOM/SERIALCOMUE427/INSTRUCTIONS-PLUGIN.txt +++ /dev/null @@ -1,42 +0,0 @@ - -BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- - -#1 Select the Zipfile for your correct Engine: - - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) - - SERIALCOMUE426/SERIALCOM.zip (Unreal Engine 4.26) - - SERIALCOMUE427/SERIALCOM.zip (Unreal Engine 4.27) - - SERIALCOMUE5EA/SERIALCOM.zip (Unreal Engine 5.0 Early Access) - -#2 Unzip the correspondent Zip file into your project "Plugins" Folder. If doesn't exist, create one. ----------->Your_Project_Folder--> ------------------>Binaries ------------------>Config ------------------>Content ------------------>DerivedDataCache ------------------>Intermidiate ------------------>Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") ------------------>Saved -Your_Project.uproject - - -#3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. - -#4 Re-Start your Project. You are ready to use the plugin!!! - - -Enjoy it! - - -https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port/ - -For support and comments, -Discord: https://discord.ramiroslab.com -Github: https://github.reamiroslab.com -YouTube: https://youtube.ramiroslab.com - -Thank you! -Ramiro Montes De Oca, -Ramiro's Lab - diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE5EA/INSTRUCTIONS.txt b/SerialCOM/SERIALCOM/SERIALCOMUE5EA/INSTRUCTIONS.txt deleted file mode 100644 index 6b69acd..0000000 --- a/SerialCOM/SERIALCOM/SERIALCOMUE5EA/INSTRUCTIONS.txt +++ /dev/null @@ -1,42 +0,0 @@ - -BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- - -#1 Select the Zipfile for your correct Engine: - - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) - - SERIALCOMUE426/SERIALCOM.zip (Unreal Engine 4.26) - - SERIALCOMUE427/SERIALCOM.zip (Unreal Engine 4.27) - - SERIALCOMUE5EA/SERIALCOM.zip (Unreal Engine 5.0 Early Access) - -#2 Unzip the correspondent Zip file into your project "Plugins" Folder. If doesn't exist, create one. ----------->Your_Project_Folder--> ------------------>Binaries ------------------>Config ------------------>Content ------------------>DerivedDataCache ------------------>Intermidiate ------------------>Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") ------------------>Saved -Your_Project.uproject - - -#3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. - -#4 Re-Start your Project. You are ready to use the plugin!!! - - -Enjoy it! - - -https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port/ - -For support and comments, -Discord: https://discord.ramiroslab.com -Github: https://github.reamiroslab.com -YouTube: https://youtube.ramiroslab.com - -Thank you! -Ramiro Montes De Oca, -Ramiro's Lab - diff --git a/SerialCOM/SERIALCOM/ArduinoTypesExample/ArduinoTypesExample.ino b/SerialCOM/SerialComPlugin/ArduinoTypesExample/ArduinoTypesExample.ino similarity index 100% rename from SerialCOM/SERIALCOM/ArduinoTypesExample/ArduinoTypesExample.ino rename to SerialCOM/SerialComPlugin/ArduinoTypesExample/ArduinoTypesExample.ino diff --git a/SerialCOM/SerialComPlugin/ArduinoTypesExample/BP_SerialCom.uasset b/SerialCOM/SerialComPlugin/ArduinoTypesExample/BP_SerialCom.uasset new file mode 100644 index 0000000..5d26583 Binary files /dev/null and b/SerialCOM/SerialComPlugin/ArduinoTypesExample/BP_SerialCom.uasset differ diff --git a/SerialCOM/SerialComPlugin/ArduinoTypesExample/UpdateThis.txt b/SerialCOM/SerialComPlugin/ArduinoTypesExample/UpdateThis.txt new file mode 100644 index 0000000..e69de29 diff --git a/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE425.uasset b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE425.uasset new file mode 100644 index 0000000..5a736b3 Binary files /dev/null and b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE425.uasset differ diff --git a/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE426.uasset b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE426.uasset new file mode 100644 index 0000000..41a7922 Binary files /dev/null and b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE426.uasset differ diff --git a/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE427.uasset b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE427.uasset new file mode 100644 index 0000000..7cb0606 Binary files /dev/null and b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom-v3_UE427.uasset differ diff --git a/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom_v3_UE5EA.uasset b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom_v3_UE5EA.uasset new file mode 100644 index 0000000..95315b9 Binary files /dev/null and b/SerialCOM/SerialComPlugin/BLUEPRINTS/BP_SerialCom_v3_UE5EA.uasset differ diff --git a/SerialCOM/SerialComPlugin/BLUEPRINTS/INSTRUCTIONS.txt b/SerialCOM/SerialComPlugin/BLUEPRINTS/INSTRUCTIONS.txt new file mode 100644 index 0000000..0620e1f --- /dev/null +++ b/SerialCOM/SerialComPlugin/BLUEPRINTS/INSTRUCTIONS.txt @@ -0,0 +1,44 @@ + +BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) +------------------------------------------------------------------------------------------------- + +#1 Inside this folder "BLUEPRINTS", there is the same blueprint example for each different UE version. + +#2 Drag and Drop this file "BP_SerialCom_UExx.uasset" into your project. + - BP_SerialCom_UE425.uasset for Unreal Engine 4.25 + - BP_SerialCom_UE426.uasset for Unreal Engine 4.26 + - BP_SerialCom_UE427.uasset for Unreal Engine 4.27 + - BP_SerialCom_UE50EA.uasset for Unreal Engine 5.0EA* + + +#3 Drag and Drop ""BP_Serial_UEXxx" blueprint inside your Level. + +#4 Inside the BP_Serial_UExx, change the "Port" number to your correspondent port in your micro-controller or Serial Communication Application. + +#5 Connect your Arduino or any other Serial Communication device you your computer. + +#6 If you see "PORT IS INITIALIZED!" on your screen, that is a confirmation that the port is connected to a Serial Port. + + +#7 Once you confirm your Com port, you are ready to test the blueprint. + - Press the "SPACE BAR" to print a string on the serial port and send another message to the UE screen. + - Press the letter "Q" to close the Serial Port. + - Press the letter "Z" to reconnect to the Serial Port. + +Enjoy it! + + +https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port/ + +For support and comments, + +Discord: https://discord.ramiroslab.com + +Github: https://github.reamiroslab.com + +YouTube: https://youtube.ramiroslab.com + +Thank you! +Ramiro Montes De Oca, +Ramiro's Lab + diff --git a/SerialCOM/SERIALCOM/Config/FilterPlugin.ini b/SerialCOM/SerialComPlugin/Config/FilterPlugin.ini similarity index 83% rename from SerialCOM/SERIALCOM/Config/FilterPlugin.ini rename to SerialCOM/SerialComPlugin/Config/FilterPlugin.ini index dbd0c95..af1b823 100644 --- a/SerialCOM/SERIALCOM/Config/FilterPlugin.ini +++ b/SerialCOM/SerialComPlugin/Config/FilterPlugin.ini @@ -6,4 +6,8 @@ ; /README.txt ; /Extras/... ; /Binaries/ThirdParty/*.dll -; /ArduinoTypesExample/ArduinoTypesExample.ino + +/BLUEPRINTS/ +/INSTRUCTIONS-PLUGIN.txt +/LICENSE.txt +/RELEASE_3-0-0.txt \ No newline at end of file diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE426/INSTRUCTIONS-PLUGIN.txt b/SerialCOM/SerialComPlugin/INSTRUCTIONS-PLUGIN.txt similarity index 82% rename from SerialCOM/SERIALCOM/SERIALCOMUE426/INSTRUCTIONS-PLUGIN.txt rename to SerialCOM/SerialComPlugin/INSTRUCTIONS-PLUGIN.txt index 6b69acd..a7ade70 100644 --- a/SerialCOM/SERIALCOM/SERIALCOMUE426/INSTRUCTIONS-PLUGIN.txt +++ b/SerialCOM/SerialComPlugin/INSTRUCTIONS-PLUGIN.txt @@ -1,6 +1,6 @@ BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) -------------------------------------------------------------------------------------------------- +------------------------------------------------------------------------------------------ #1 Select the Zipfile for your correct Engine: - SERIALCOMUE425/SERIALCOM.zip (Unreal Engine 4.25) @@ -16,15 +16,17 @@ BLUEPRINT FOR UNREAL ENGINE (4.25/4.26/4.27/*5.0EA) ----------------->DerivedDataCache ----------------->Intermidiate ----------------->Plugins_ - |------>SERIALCOM* (The name of the folder should be "SERIALCOM") + |------>SERIALCOM_UExxx ----------------->Saved Your_Project.uproject - #3 Activate "Communication Serial Port (Serial COM)" plugin from your plugin list. #4 Re-Start your Project. You are ready to use the plugin!!! +*5.0EA (Unreal Engine 5 is using the same binary as 4.27, but it will work. A warning message will show up telling you that the plugin is for 4.27, accept and continue) + + Enjoy it! diff --git a/SerialCOM/SERIALCOM/LICENSE.txt b/SerialCOM/SerialComPlugin/LICENSE.txt similarity index 100% rename from SerialCOM/SERIALCOM/LICENSE.txt rename to SerialCOM/SerialComPlugin/LICENSE.txt diff --git a/SerialCOM/SERIALCOM/RELEASE_3-0-0.txt b/SerialCOM/SerialComPlugin/RELEASE_v3.0.0.5.txt similarity index 90% rename from SerialCOM/SERIALCOM/RELEASE_3-0-0.txt rename to SerialCOM/SerialComPlugin/RELEASE_v3.0.0.5.txt index 26158a4..8c61975 100644 --- a/SerialCOM/SERIALCOM/RELEASE_3-0-0.txt +++ b/SerialCOM/SerialComPlugin/RELEASE_v3.0.0.5.txt @@ -1,7 +1,14 @@ -"Serial COM" v3.0.0 (Beta) RELEASE NOTES ----------------------------------------------------------------------------------------------------- +"Serial COM" v3.0.0.05 (Beta) RELEASE NOTES +-------------------------------------------------------------- + +- Small but significant change. Internally changed the function from "USerial" to "USerialCom" to avoid problems if another UE4Duino plugin is running at the same time. This change makes is to avoid any conflict with old functions and corruption of plugins. + + + +"Serial COM" v3.0.0.04 (Beta) RELEASE NOTES +-------------------------------------------------------------- Changes from "UE4Duino" 2.2.5 to "Serial COM" v3.0.0 (Beta) - The "Serial COM" 3.0.0 Plugin now works nativelley in Unreal Engine 4.27/4.26/4.24 (PARTIAL SUPPORT WITH UE 5EA*) without having to re-build the project and possibly not be able to re-build for the lack of missing SDK's requirements. diff --git a/SerialCOM/SERIALCOM/Resources/Icon128.png b/SerialCOM/SerialComPlugin/Resources/Icon128.png similarity index 100% rename from SerialCOM/SERIALCOM/Resources/Icon128.png rename to SerialCOM/SerialComPlugin/Resources/Icon128.png diff --git a/SerialCOM/SERIALCOM/SERIALCOM.uplugin b/SerialCOM/SerialComPlugin/SERIALCOM.uplugin similarity index 92% rename from SerialCOM/SERIALCOM/SERIALCOM.uplugin rename to SerialCOM/SerialComPlugin/SERIALCOM.uplugin index ceea786..7d60aff 100644 --- a/SerialCOM/SERIALCOM/SERIALCOM.uplugin +++ b/SerialCOM/SerialComPlugin/SERIALCOM.uplugin @@ -3,14 +3,14 @@ "FriendlyName": "Communication Serial Port (Serial COM)", "Version": 3, - "VersionName": "3.0.0.04", + "VersionName": "3.0.0.05", "CreatedBy": "Ramiro Montes De Oca", "CreatedByURL": "https://github.com/videofeedback/RamirosLab", "DocsURL": "https://github.com/videofeedback/Unreal-Engine-Plugin-Communication-Serial-Port", "SupportURL": "https://discord.ramiroslab.com/", "Description": "This library enables Serial communication with Unreal Engine 4/5. Added DTR/RTS flow control. Compatible with Arduino projects and any other device requiring Serial Communication. This project was forked from EU4Duino (v1 Gryzly32/FuzionLabs, v2 Rodrigo Villani). - v3 Serial Com by Ramiro Montes De Oca.", +Serial Com v3 by Ramiro Montes De Oca.", "Category": "Input", diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE425/SERIALCOM.zip b/SerialCOM/SerialComPlugin/SERIALCOM_UE425/SERIALCOM_UE425.zip similarity index 63% rename from SerialCOM/SERIALCOM/SERIALCOMUE425/SERIALCOM.zip rename to SerialCOM/SerialComPlugin/SERIALCOM_UE425/SERIALCOM_UE425.zip index f657943..50b387b 100644 Binary files a/SerialCOM/SERIALCOM/SERIALCOMUE425/SERIALCOM.zip and b/SerialCOM/SerialComPlugin/SERIALCOM_UE425/SERIALCOM_UE425.zip differ diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE426/SERIALCOM.zip b/SerialCOM/SerialComPlugin/SERIALCOM_UE426/SERIALCOM_UE426.zip similarity index 63% rename from SerialCOM/SERIALCOM/SERIALCOMUE426/SERIALCOM.zip rename to SerialCOM/SerialComPlugin/SERIALCOM_UE426/SERIALCOM_UE426.zip index 9a0aec3..f7602e6 100644 Binary files a/SerialCOM/SERIALCOM/SERIALCOMUE426/SERIALCOM.zip and b/SerialCOM/SerialComPlugin/SERIALCOM_UE426/SERIALCOM_UE426.zip differ diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE427/SERIALCOM.zip b/SerialCOM/SerialComPlugin/SERIALCOM_UE427/SERIALCOM_UE427.zip similarity index 64% rename from SerialCOM/SERIALCOM/SERIALCOMUE427/SERIALCOM.zip rename to SerialCOM/SerialComPlugin/SERIALCOM_UE427/SERIALCOM_UE427.zip index 4da8ea4..90914ad 100644 Binary files a/SerialCOM/SERIALCOM/SERIALCOMUE427/SERIALCOM.zip and b/SerialCOM/SerialComPlugin/SERIALCOM_UE427/SERIALCOM_UE427.zip differ diff --git a/SerialCOM/SERIALCOM/SERIALCOMUE5EA/SERIALCOM.zip b/SerialCOM/SerialComPlugin/SERIALCOM_UE5EA/SERIALCOM_UE5EA.zip similarity index 54% rename from SerialCOM/SERIALCOM/SERIALCOMUE5EA/SERIALCOM.zip rename to SerialCOM/SerialComPlugin/SERIALCOM_UE5EA/SERIALCOM_UE5EA.zip index f40aefd..c838de1 100644 Binary files a/SerialCOM/SERIALCOM/SERIALCOMUE5EA/SERIALCOM.zip and b/SerialCOM/SerialComPlugin/SERIALCOM_UE5EA/SERIALCOM_UE5EA.zip differ diff --git a/SerialCOM/SERIALCOM/Source/SERIALCOM/Private/SERIALCOMModule.cpp b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Private/SERIALCOMModule.cpp similarity index 100% rename from SerialCOM/SERIALCOM/Source/SERIALCOM/Private/SERIALCOMModule.cpp rename to SerialCOM/SerialComPlugin/Source/SERIALCOM/Private/SERIALCOMModule.cpp diff --git a/SerialCOM/SERIALCOM/Source/SERIALCOM/Private/SerialCom.cpp b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Private/SerialCom.cpp similarity index 88% rename from SerialCOM/SERIALCOM/Source/SERIALCOM/Private/SerialCom.cpp rename to SerialCOM/SerialComPlugin/Source/SERIALCOM/Private/SerialCom.cpp index 5523bea..a988a53 100644 --- a/SerialCOM/SERIALCOM/Source/SERIALCOM/Private/SerialCom.cpp +++ b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Private/SerialCom.cpp @@ -9,9 +9,9 @@ #define BOOL2bool(B) B == 0 ? false : true -USerial* USerial::OpenComPortWithFlowControl(bool& bOpened, int32 Port, int32 BaudRate, bool DTR, bool RTS) +USerialCom* USerialCom::OpenComPortWithFlowControl(bool& bOpened, int32 Port, int32 BaudRate, bool DTR, bool RTS) { - USerial* Serial = NewObject(); + USerialCom* Serial = NewObject(); bOpened = Serial->OpenWFC(Port, BaudRate, DTR, RTS); return Serial; } @@ -22,9 +22,9 @@ USerial* USerial::OpenComPortWithFlowControl(bool& bOpened, int32 Port, int32 Ba ////////////////////////////////////////////////////////////////////////////////////// -USerial* USerial::OpenComPort(bool& bOpened, int32 Port, int32 BaudRate) +USerialCom* USerialCom::OpenComPort(bool& bOpened, int32 Port, int32 BaudRate) { - USerial* Serial = NewObject(); + USerialCom* Serial = NewObject(); bOpened = Serial->OpenWFC(Port, BaudRate); return Serial; } @@ -36,7 +36,7 @@ USerial* USerial::OpenComPort(bool& bOpened, int32 Port, int32 BaudRate) -int32 USerial::BytesToInt(TArray Bytes) +int32 USerialCom::BytesToInt(TArray Bytes) { if (Bytes.Num() != 4) { @@ -46,7 +46,7 @@ int32 USerial::BytesToInt(TArray Bytes) return *reinterpret_cast(Bytes.GetData()); } -TArray USerial::IntToBytes(const int32 &Int) +TArray USerialCom::IntToBytes(const int32 &Int) { TArray Bytes; Bytes.Append(reinterpret_cast(&Int), 4); @@ -55,7 +55,7 @@ TArray USerial::IntToBytes(const int32 &Int) -float USerial::BytesToFloat(TArray Bytes) +float USerialCom::BytesToFloat(TArray Bytes) { if (Bytes.Num() != 4) { @@ -67,7 +67,7 @@ float USerial::BytesToFloat(TArray Bytes) -TArray USerial::FloatToBytes(const float &Float) +TArray USerialCom::FloatToBytes(const float &Float) { TArray Bytes; Bytes.Append(reinterpret_cast(&Float), 4); @@ -77,7 +77,7 @@ TArray USerial::FloatToBytes(const float &Float) -USerial::USerial() +USerialCom::USerialCom() : WriteLineEnd(ELineEnd::n) , m_hIDComDev(nullptr) , m_OverlappedRead(nullptr) @@ -93,7 +93,7 @@ USerial::USerial() FMemory::Memset(m_OverlappedWrite, 0, sizeof(OVERLAPPED)); } -USerial::~USerial() +USerialCom::~USerialCom() { Close(); @@ -121,7 +121,7 @@ USerial::~USerial() //////////////////////////////////////////////////////////////////// -bool USerial::OpenWFC(int32 nPort, int32 nBaud, bool bDTR, bool bRTS) +bool USerialCom::OpenWFC(int32 nPort, int32 nBaud, bool bDTR, bool bRTS) { if (nPort < 0) { @@ -211,7 +211,7 @@ bool USerial::OpenWFC(int32 nPort, int32 nBaud, bool bDTR, bool bRTS) //////////////////////////////////////////////////////////////////// -void USerial::Close() +void USerialCom::Close() { if (!m_hIDComDev) return; @@ -223,17 +223,17 @@ void USerial::Close() RemoveFromRoot(); } -FString USerial::ReadString(bool &bSuccess) +FString USerialCom::ReadString(bool &bSuccess) { return ReadStringUntil(bSuccess, '\0'); } -FString USerial::Readln(bool &bSuccess) +FString USerialCom::Readln(bool &bSuccess) { return ReadStringUntil(bSuccess, '\n'); } -FString USerial::ReadStringUntil(bool &bSuccess, uint8 Terminator) +FString USerialCom::ReadStringUntil(bool &bSuccess, uint8 Terminator) { bSuccess = false; if (!m_hIDComDev) return TEXT(""); @@ -287,7 +287,7 @@ FString USerial::ReadStringUntil(bool &bSuccess, uint8 Terminator) return FString(Convert.Get()); } -float USerial::ReadFloat(bool &bSuccess) +float USerialCom::ReadFloat(bool &bSuccess) { bSuccess = false; @@ -298,7 +298,7 @@ float USerial::ReadFloat(bool &bSuccess) return *(reinterpret_cast(Bytes.GetData())); } -int32 USerial::ReadInt(bool &bSuccess) +int32 USerialCom::ReadInt(bool &bSuccess) { bSuccess = false; @@ -309,7 +309,7 @@ int32 USerial::ReadInt(bool &bSuccess) return *(reinterpret_cast(Bytes.GetData())); } -uint8 USerial::ReadByte(bool &bSuccess) +uint8 USerialCom::ReadByte(bool &bSuccess) { bSuccess = false; if (!m_hIDComDev) return 0x0; @@ -345,7 +345,7 @@ uint8 USerial::ReadByte(bool &bSuccess) return Byte; } -TArray USerial::ReadBytes(int32 Limit) +TArray USerialCom::ReadBytes(int32 Limit) { TArray Data; @@ -384,7 +384,7 @@ TArray USerial::ReadBytes(int32 Limit) return Data; } -bool USerial::Print(FString String) +bool USerialCom::Print(FString String) { auto Convert = FTCHARToUTF8(*String); TArray Data; @@ -393,32 +393,32 @@ bool USerial::Print(FString String) return WriteBytes(Data); } -bool USerial::Println(FString String) +bool USerialCom::Println(FString String) { return Print(String + LineEndToStr(WriteLineEnd)); } -bool USerial::WriteFloat(float Value) +bool USerialCom::WriteFloat(float Value) { TArray Buffer; Buffer.Append(reinterpret_cast(&Value), 4); return WriteBytes(Buffer); } -bool USerial::WriteInt(int32 Value) +bool USerialCom::WriteInt(int32 Value) { TArray Buffer; Buffer.Append(reinterpret_cast(&Value), 4); return WriteBytes(Buffer); } -bool USerial::WriteByte(uint8 Value) +bool USerialCom::WriteByte(uint8 Value) { TArray Buffer({ Value }); return WriteBytes(Buffer); } -bool USerial::WriteBytes(TArray Buffer) +bool USerialCom::WriteBytes(TArray Buffer) { if (!m_hIDComDev) false; @@ -444,7 +444,7 @@ bool USerial::WriteBytes(TArray Buffer) return true; } -void USerial::Flush() +void USerialCom::Flush() { if (!m_hIDComDev) return; @@ -455,7 +455,7 @@ void USerial::Flush() } while (Data.Num() > 0); } -FString USerial::LineEndToStr(ELineEnd LineEnd) +FString USerialCom::LineEndToStr(ELineEnd LineEnd) { switch (LineEnd) { @@ -479,7 +479,7 @@ FString USerial::LineEndToStr(ELineEnd LineEnd) //////////////////////////////////////////////////////////////////// /* -FString USerial::LineEndToStrBD(ELineEnd LineEnd) +FString USerialCom::LineEndToStrBD(ELineEnd LineEnd) { switch (LineEnd) { diff --git a/SerialCOM/SERIALCOM/Source/SERIALCOM/Public/SERIALCOMModule.h b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Public/SERIALCOMModule.h similarity index 100% rename from SerialCOM/SERIALCOM/Source/SERIALCOM/Public/SERIALCOMModule.h rename to SerialCOM/SerialComPlugin/Source/SERIALCOM/Public/SERIALCOMModule.h diff --git a/SerialCOM/SERIALCOM/Source/SERIALCOM/Public/SerialCom.h b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Public/SerialCom.h similarity index 97% rename from SerialCOM/SERIALCOM/Source/SERIALCOM/Public/SerialCom.h rename to SerialCOM/SerialComPlugin/Source/SERIALCOM/Public/SerialCom.h index 7900ead..c870cc2 100644 --- a/SerialCOM/SERIALCOM/Source/SERIALCOM/Public/SerialCom.h +++ b/SerialCOM/SerialComPlugin/Source/SERIALCOM/Public/SerialCom.h @@ -27,7 +27,7 @@ enum class ELineEnd : uint8 }; UCLASS(BlueprintType, Category = "Communication Serial", meta = (Keywords = "com arduino serial arduino duino")) -class SERIALCOM_API USerial : public UObject +class SERIALCOM_API USerialCom : public UObject { GENERATED_BODY() @@ -37,8 +37,8 @@ class SERIALCOM_API USerial : public UObject ELineEnd WriteLineEnd; public: - USerial(); - ~USerial(); + USerialCom(); + ~USerialCom(); /** * Open a serial port and return the created Serial instance. @@ -52,7 +52,7 @@ class SERIALCOM_API USerial : public UObject * @return A Serial instance to work with the opened port. */ UFUNCTION(BlueprintCallable, meta = (DisplayName = "Open Serial Port With Flow Control"), Category = "Communication Serial", meta = (Keywords = "communication com SERIALCOM duino arduino serial port start open serial with flow control")) - static USerial* OpenComPortWithFlowControl(bool &bOpened, int32 Port = 1, int32 BaudRate = 9600, bool DTR = true, bool RTS = true); + static USerialCom* OpenComPortWithFlowControl(bool &bOpened, int32 Port = 1, int32 BaudRate = 9600, bool DTR = true, bool RTS = true); /** * Utility function to convert 4 bytes into an Integer. If the input array's length is not 4, returns 0. @@ -69,7 +69,7 @@ class SERIALCOM_API USerial : public UObject ////////////////////////////////////////////////////////////////////////////////////// UFUNCTION(BlueprintCallable, meta = (DisplayName = "Open Serial Port"), Category = "Communication Serial", meta = (Keywords = "communication com SERIALCOM duino arduino serial port start open serial")) - static USerial* OpenComPort(bool &bOpened, int32 Port = 1, int32 BaudRate = 9600); + static USerialCom* OpenComPort(bool &bOpened, int32 Port = 1, int32 BaudRate = 9600); /** * Utility function to convert 4 bytes into an Integer. If the input array's length is not 4, returns 0. diff --git a/SerialCOM/SERIALCOM/Source/SERIALCOM/SERIALCOM.Build.cs b/SerialCOM/SerialComPlugin/Source/SERIALCOM/SERIALCOM.Build.cs similarity index 100% rename from SerialCOM/SERIALCOM/Source/SERIALCOM/SERIALCOM.Build.cs rename to SerialCOM/SerialComPlugin/Source/SERIALCOM/SERIALCOM.Build.cs