exodus/Leo-ElixirLights
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proj: refinement

Browse Source
This commit is contained in:
Gustice
2025-11-09 19:04:54 +01:00
parent 889523f0c8
commit 598f1262d7
15 changed files with 596 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/spit/src/SPIT_Client.cpp
+12 -12
View File
@@ -194,7 +194,7 @@ void SPIT_Client::eventServerChanged(SAD_DetectedServer &server) {
// m_ServerIP = detected.getIP();
// #if defined(DEBUGOUTPUT)
// printf("MySPITApp: connect to %s ", detected.getIP().data());
// ESP_LOGD(TAG, "MySPITApp: connect to %s ", detected.getIP().data());
// #endif
// // Use the m_BoardNumber as login name
// string stringLoginName = "";
@@ -573,7 +573,7 @@ void SPIT_Client::parseDisconnect(SPIT_Message::Disconnect &p_Disconnect) {
* @param p_Watchdog
*/
void SPIT_Client::parseWatchdog(SPIT_Message::Watchdog &p_Watchdog) {
// printf("parse Watchdog \n");
// ESP_LOGD(TAG, "parse Watchdog ");
SPIT_Message::WatchdogAnswer o_WatchdogAnswer;
sendSPITMessage(o_WatchdogAnswer);
}
@@ -604,7 +604,7 @@ void SPIT_Client::eventWatchdogLost() {
//----- SPIT Project ------
void SPIT_Client::parseReportSPITProject(SPIT_Message::ReportSPITProject &p_ReportSPITProject) {
// printf("parse ReportSPITProject \n");
ESP_LOGD(TAG, "parse ReportSPITProject");
m_ServerProjectID = p_ReportSPITProject.getProjectID();
m_ServerProjectName = p_ReportSPITProject.getProjectName();
m_ServerFramesPerSecond = p_ReportSPITProject.getFramesPerSecond();
@@ -617,7 +617,7 @@ void SPIT_Client::parseReportSPITProject(SPIT_Message::ReportSPITProject &p_Repo
// Send RequestProjectTransfer
SPIT_Message::RequestProjectTransfer sMRequestProjectTransfer;
if (sendSPITMessage(sMRequestProjectTransfer) < 0) {
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send RequestProjectTransfer\n");
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send RequestProjectTransfer");
}
// todo Don't send the ReportSPITProject here it should be sended after parseEndProjectTransfer
@@ -629,7 +629,7 @@ void SPIT_Client::parseReportSPITProject(SPIT_Message::ReportSPITProject &p_Repo
}
}
void SPIT_Client::parseCloseSPITProject(SPIT_Message::CloseSPITProject &p_CloseSPITProject) {
// printf("parse CloseSPITProject \n");
ESP_LOGD(TAG, "parse CloseSPITProject");
string stringProjectID;
mCallbacks.onProjectUpdate(ProjUpdate::ServerClosed, p_CloseSPITProject.getProjectID());
SPITPlayer::clearPlayers();
@@ -640,7 +640,7 @@ string SPIT_Client::getServerProjectName() { return m_ServerProjectName; }
int SPIT_Client::getServerFramesPerSecond() { return m_ServerFramesPerSecond; }
void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransfer &p_RequestProjectTransfer) {
// printf("parse RequestProjectTransfer \n");
ESP_LOGD(TAG, "parse RequestProjectTransfer");
// StartProjectTransfer
SPIT_Message::StartProjectTransfer sMStartProjectTransfer;
if (sendSPITMessage(sMStartProjectTransfer) < 0) {
@@ -674,7 +674,7 @@ void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransf
/* NEW IMPLEMENTATION
void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransfer* p_RequestProjectTransfer) {
// printf("parse RequestProjectTransfer \n");
// ESP_LOGD(TAG, "parse RequestProjectTransfer");
thread* o_ThreadSend;
o_ThreadSend = new thread(&this->sendProject, this);
// int intResult;
@@ -814,7 +814,7 @@ void SPIT_Client::parseEndProjectTransfer(SPIT_Message::EndProjectTransfer &p_En
//----- SPIT Types ------
void SPIT_Client::parseReportSPITType(SPIT_Message::ReportSPITType &p_ReportSPITType) {
// printf("parse ReportSPITType ID %s Name %s \n",p_ReportSPITType.getID(), p_ReportSPITType.getName());
ESP_LOGD(TAG, "parse ReportSPITType ID %s Name %s",p_ReportSPITType.getID().c_str(), p_ReportSPITType.getName().c_str());
SPITType *ptrSPITType;
bool boolNew = false;
bool boolChanged = false;
@@ -864,7 +864,7 @@ void SPIT_Client::parseReportSPITType(SPIT_Message::ReportSPITType &p_ReportSPIT
}
}
void SPIT_Client::parseRemoveSPITType(SPIT_Message::RemoveSPITType &p_RemoveSPITType) {
// printf("parse RemoveSPITType %s\n", p_RemoveSPITType.getID());
ESP_LOGD(TAG, "parse RemoveSPITType %s", p_RemoveSPITType.getID().c_str());
bool boolRemote = false;
string stringSPITTypeID = p_RemoveSPITType.getID();
@@ -989,14 +989,14 @@ SPITType *SPIT_Client::createSPITType(string p_ID, string p_GroupName, string p_
//----- SPIT Objects ------
void SPIT_Client::parseReportSPITObject(SPIT_Message::ReportSPITObject &p_ReportSPITObject) {
ESP_LOGD(TAG, "parse ReportSPITObject %s\n", p_ReportSPITObject.getID().c_str());
ESP_LOGD(TAG, "parse ReportSPITObject %s", p_ReportSPITObject.getID().c_str());
SPITObject *ptrSPITObject;
SPITType *ptrSPITType;
bool boolNew = false;
bool boolRemote = false;
bool boolChanged = false;
{
ESP_LOGD(TAG, "parseReportSPITObject %s / %s", p_ReportSPITObject.getID().c_str(), p_ReportSPITObject.getName().c_str());
ESP_LOGD(TAG, "parse ReportSPITObject %s / %s", p_ReportSPITObject.getID().c_str(), p_ReportSPITObject.getName().c_str());
if (p_ReportSPITObject.getServerRemote() == false) {
boolRemote = false;
ptrSPITObject = mSpitObjects.getEntry(p_ReportSPITObject.getID());
@@ -1069,7 +1069,7 @@ void SPIT_Client::parseReportSPITObject(SPIT_Message::ReportSPITObject &p_Report
}
}
void SPIT_Client::parseRemoveSPITObject(SPIT_Message::RemoveSPITObject &p_RemoveSPITObject) {
// printf("parse RemoveSPITObject %s\n", p_RemoveSPITObject.getID());
ESP_LOGD(TAG, "parse RemoveSPITObject %s", p_RemoveSPITObject.getID().c_str());
SPITObject *ptrSPITObject = mRemoteSpitObjects.getEntry(p_RemoveSPITObject.getID());
if (ptrSPITObject != nullptr) {
SPITType *ptrSPITType = mRemoteSpitTypes.getEntry(ptrSPITObject->getSPITTypeID());