exodus/1NiM-WatingRoom-WatchController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring message

Browse Source
This commit is contained in:
Gustice
2025-11-10 10:43:13 +01:00
parent 598f1262d7
commit f064794499
13 changed files with 1968 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/spit/src/SPITObject.cpp
+3 -3
View File
@@ -59,7 +59,7 @@ SPITObject::SPITObject(string p_ID) {
m_ID = p_ID;
}
bool SPITObject::setMessageOP(SPIT_Message::ReportSPITObject *p_ReportSPITObject) {
bool SPITObject::setMessageOP(Message::ReportObject *p_ReportSPITObject) {
bool boolChangeAllowed;
bool boolChanged = false;
@@ -193,7 +193,7 @@ bool SPITObject::setMessageOP(SPIT_Message::ReportSPITObject *p_ReportSPITObject
return boolChanged;
}
void SPITObject::fillMessageOP(SPIT_Message::ReportSPITObject &p_ReportSPITObject) {
void SPITObject::fillMessageOP(Message::ReportObject &p_ReportSPITObject) {
p_ReportSPITObject.setActionAssigned(getActionAssigned()); // Action can be assigned to type or to this object
p_ReportSPITObject.setConfirmed(m_Confirmed);
p_ReportSPITObject.setDelay(m_Delay);
@@ -213,7 +213,7 @@ void SPITObject::fillMessageOP(SPIT_Message::ReportSPITObject &p_ReportSPITObjec
p_ReportSPITObject.setValueFactor(m_ValueFactor);
p_ReportSPITObject.setValueUse(m_ValueUse);
}
void SPITObject::fillMessageOP(SPIT_Message::RemoveSPITObject &p_RemoveSPITObject) {
void SPITObject::fillMessageOP(Message::RemoveObject &p_RemoveSPITObject) {
p_RemoveSPITObject.setID(m_ID);
}
components/spit/src/SPITType.cpp
+5 -3
View File
@@ -15,6 +15,8 @@
#include "SPITType.h"
#include "esp_log.h"
using namespace spit;
static const char *TAG = "SPIT";
void SPITType::eventProjectClosed(SpitRepo<SPITType> &repo, SpitRepo<SPITType> &remoteRepo) {
@@ -144,7 +146,7 @@ bool SPITType::setActionAssigned(bool p_ActionAssigned) {
* @return true = the SPITType is changed
* false = the SPITType is NOT changed, because it is not allowed to change.
*/
bool SPITType::setMessageOP(SPIT_Message::ReportSPITType &reportSpitType) {
bool SPITType::setMessageOP(Message::ReportType &reportSpitType) {
bool boolChangeAllowed;
bool boolChanged = false;
@@ -221,7 +223,7 @@ bool SPITType::setMessageOP(SPIT_Message::ReportSPITType &reportSpitType) {
return boolChanged;
}
void SPITType::fillMessageOP(SPIT_Message::ReportSPITType &smReportSpitType) const {
void SPITType::fillMessageOP(Message::ReportType &smReportSpitType) const {
smReportSpitType.setConfirmed(m_Confirmed);
smReportSpitType.setDelay(m_DefaultDelay);
smReportSpitType.setDuration(m_DefaultDuration);
@@ -232,6 +234,6 @@ void SPITType::fillMessageOP(SPIT_Message::ReportSPITType &smReportSpitType) con
smReportSpitType.setServerProjectIndepended(m_ServerProjectIndepended);
smReportSpitType.setServerRemote(m_ServerRemote);
}
void SPITType::fillMessageOP(SPIT_Message::RemoveSPITType &smRemoveSpitType) const {
void SPITType::fillMessageOP(Message::RemoveType &smRemoveSpitType) const {
smRemoveSpitType.setID(m_ID);
}
components/spit/src/SPIT_Client.cpp
+104 -104
View File
@@ -5,7 +5,7 @@
*/
/*
* SPIt_Client handles the SPIT_Message transfer and
* SPIt_Client handles the Message transfer and
* fires eventxxx functions to the SPIT_ClientInterface (implemented by the user app).
*
* File: SPIT_Client.cpp
@@ -39,9 +39,9 @@ SPIT_Client::~SPIT_Client() {
void SPIT_Client::clientProjectClose() {
if (m_ConnectionStatus == Connection::Ok) {
ESP_LOGI(TAG, " ... tidy up ressources");
SPIT_Message::CloseSPITProject closeSPITProject(m_ProjName);
Message::CloseProject closeSPITProject(m_ProjName);
if (sendSPITMessage(closeSPITProject) < 0) {
ESP_LOGD(TAG, "SPIT_Client could not send Client's ReportSPITProject");
ESP_LOGD(TAG, "SPIT_Client could not send Client's ReportProject");
}
}
}
@@ -52,15 +52,15 @@ void SPIT_Client::clientProjectLoaded() {
SPITObject::setConfirmedFalse(mSpitObjects);
if (m_ConnectionStatus == Connection::Ok) {
// send ReportSPITProject to the server
SPIT_Message::ReportSPITProject reportSPITProject(m_ProjName, m_ProjName);
// send ReportProject to the server
Message::ReportProject reportSPITProject(m_ProjName, m_ProjName);
reportSPITProject.setFramesPerSecond(0);
if (sendSPITMessage(reportSPITProject) < 0) {
ESP_LOGD(TAG, "SPIT_CLient::clientProjectLoaded could not send Client's ReportSPITProject");
ESP_LOGD(TAG, "SPIT_CLient::clientProjectLoaded could not send Client's ReportProject");
}
// send RequestProjectTransfer
SPIT_Message::RequestProjectTransfer sMRequestProjectTransfer;
Message::RequestProjectTransfer sMRequestProjectTransfer;
if (sendSPITMessage(sMRequestProjectTransfer) < 0) {
ESP_LOGD(TAG, "SPIT_CLient::clientProjectLoaded could not send RequestProjectTransfer");
}
@@ -214,7 +214,7 @@ void SPIT_Client::eventServerChanged(SAD_DetectedServer &server) {
// // } //Excample
// }
int SPIT_Client::sendSPITMessage(SPIT_Message::OPPart &opPart) {
int SPIT_Client::sendSPITMessage(Message::OPPart &opPart) {
if (m_MessageNumber_Send == 255)
m_MessageNumber_Send = 1;
else
@@ -222,9 +222,9 @@ int SPIT_Client::sendSPITMessage(SPIT_Message::OPPart &opPart) {
opPart.setMessageNumber(m_MessageNumber_Send);
opPart.setServerInfoInHeader(m_ID, m_ServerID);
int opFlag = opPart.getHeader()->getOPFlag();
int opFlag = opPart.getHeader()->getType();
try {
auto spitMessage = SPIT_Message::createMessage(opPart);
auto spitMessage = Message::createMessage(opPart);
if (spitMessage.empty()) {
return -1;
}
@@ -264,7 +264,7 @@ void SPIT_Client::receiveSPITMessage(SPIT_Client &rM) {
continue;
}
auto vec = vector<char>(buffer, buffer + rdLen);
auto spitMsg = make_unique<SPIT_Message>(vec);
auto spitMsg = make_unique<Message>(vec);
rM.parseSPIT_Message(move(spitMsg));
// rM.checkParseSPIT_Message(move(spitMsg));
}
@@ -275,7 +275,7 @@ void SPIT_Client::resetMessageNumberReceived() {
m_OvertakingSPIT_Messages.clear();
}
void SPIT_Client::checkParseSPIT_Message(unique_ptr<SPIT_Message> p_SPITMessage) {
void SPIT_Client::checkParseSPIT_Message(unique_ptr<Message> p_SPITMessage) {
answerWatchdog();
if (!p_SPITMessage || !p_SPITMessage->getHeader() || p_SPITMessage->getOPPart()) {
ESP_LOGD(TAG, "SPIT_Client::parseSPIT_Message incomplete message");
@@ -330,7 +330,7 @@ void SPIT_Client::checkParseSPIT_Message(unique_ptr<SPIT_Message> p_SPITMessage)
}
}
void SPIT_Client::addOvertakingSPIT_Message(unique_ptr<SPIT_Message> p_SPIT_Message) {
void SPIT_Client::addOvertakingSPIT_Message(unique_ptr<Message> p_SPIT_Message) {
if (!p_SPIT_Message) {
return;
}
@@ -350,69 +350,69 @@ void SPIT_Client::addOvertakingSPIT_Message(unique_ptr<SPIT_Message> p_SPIT_Mess
m_OvertakingSPIT_Messages.push_back(move(p_SPIT_Message));
}
void SPIT_Client::parseSPIT_Message(unique_ptr<SPIT_Message> p_SPITMessage) {
void SPIT_Client::parseSPIT_Message(unique_ptr<Message> p_SPITMessage) {
answerWatchdog();
if (!p_SPITMessage || !p_SPITMessage->getHeader() || !p_SPITMessage->getOPPart()) {
ESP_LOGD(TAG, "SPIT_Client::parseSPIT_Message incomplete message");
return;
}
switch (p_SPITMessage->getOPFlag()) {
switch (p_SPITMessage->getType()) {
//----- Connection -----
case SPIT_Message::ConnectAnswer::OPFLAG:
parseConnectAnswer(p_SPITMessage->getOPPartAs<SPIT_Message::ConnectAnswer>());
case Message::ConnectAnswer::OPFLAG:
parseConnectAnswer(p_SPITMessage->getAs<Message::ConnectAnswer>());
break;
case SPIT_Message::Disconnect::OPFLAG:
parseDisconnect(p_SPITMessage->getOPPartAs<SPIT_Message::Disconnect>());
case Message::Disconnect::OPFLAG:
parseDisconnect(p_SPITMessage->getAs<Message::Disconnect>());
break;
case SPIT_Message::ReportSPITProject::OPFLAG:
parseReportSPITProject(p_SPITMessage->getOPPartAs<SPIT_Message::ReportSPITProject>());
case Message::ReportProject::OPFLAG:
parseReportSPITProject(p_SPITMessage->getAs<Message::ReportProject>());
break;
case SPIT_Message::Watchdog::OPFLAG:
parseWatchdog(p_SPITMessage->getOPPartAs<SPIT_Message::Watchdog>());
case Message::Watchdog::OPFLAG:
parseWatchdog(p_SPITMessage->getAs<Message::Watchdog>());
break;
case SPIT_Message::WatchdogAnswer::OPFLAG:
parseWatchdogAnswer(p_SPITMessage->getOPPartAs<SPIT_Message::WatchdogAnswer>());
case Message::WatchdogAnswer::OPFLAG:
parseWatchdogAnswer(p_SPITMessage->getAs<Message::WatchdogAnswer>());
break;
//----- SPIT Project -----
case SPIT_Message::StartProjectTransfer::OPFLAG:
parseStartProjectTransfer(p_SPITMessage->getOPPartAs<SPIT_Message::StartProjectTransfer>());
case Message::StartProjectTransfer::OPFLAG:
parseStartProjectTransfer(p_SPITMessage->getAs<Message::StartProjectTransfer>());
break;
case SPIT_Message::CloseSPITProject::OPFLAG:
parseCloseSPITProject(p_SPITMessage->getOPPartAs<SPIT_Message::CloseSPITProject>());
case Message::CloseProject::OPFLAG:
parseCloseSPITProject(p_SPITMessage->getAs<Message::CloseProject>());
break;
case SPIT_Message::RequestProjectTransfer::OPFLAG:
parseRequestProjectTransfer(p_SPITMessage->getOPPartAs<SPIT_Message::RequestProjectTransfer>());
case Message::RequestProjectTransfer::OPFLAG:
parseRequestProjectTransfer(p_SPITMessage->getAs<Message::RequestProjectTransfer>());
break;
case SPIT_Message::EndProjectTransfer::OPFLAG:
parseEndProjectTransfer(p_SPITMessage->getOPPartAs<SPIT_Message::EndProjectTransfer>());
case Message::EndProjectTransfer::OPFLAG:
parseEndProjectTransfer(p_SPITMessage->getAs<Message::EndProjectTransfer>());
break;
//----- SPIT Types ------
case SPIT_Message::ReportSPITType::OPFLAG:
parseReportSPITType(p_SPITMessage->getOPPartAs<SPIT_Message::ReportSPITType>());
case Message::ReportType::OPFLAG:
parseReportSPITType(p_SPITMessage->getAs<Message::ReportType>());
break;
case SPIT_Message::RemoveSPITType::OPFLAG:
parseRemoveSPITType(p_SPITMessage->getOPPartAs<SPIT_Message::RemoveSPITType>());
case Message::RemoveType::OPFLAG:
parseRemoveSPITType(p_SPITMessage->getAs<Message::RemoveType>());
//----- SPIT Objects ------
break;
case SPIT_Message::ReportSPITObject::OPFLAG:
parseReportSPITObject(p_SPITMessage->getOPPartAs<SPIT_Message::ReportSPITObject>());
case Message::ReportObject::OPFLAG:
parseReportSPITObject(p_SPITMessage->getAs<Message::ReportObject>());
break;
case SPIT_Message::RemoveSPITObject::OPFLAG:
parseRemoveSPITObject(p_SPITMessage->getOPPartAs<SPIT_Message::RemoveSPITObject>());
case Message::RemoveObject::OPFLAG:
parseRemoveSPITObject(p_SPITMessage->getAs<Message::RemoveObject>());
break;
//----- Play SPIT Objects ------
case SPIT_Message::PlaySPITStart::OPFLAG:
parsePlaySPITStart(p_SPITMessage->getOPPartAs<SPIT_Message::PlaySPITStart>());
case Message::PlayStart::OPFLAG:
parsePlaySPITStart(p_SPITMessage->getAs<Message::PlayStart>());
break;
case SPIT_Message::PlaySPITObject::OPFLAG:
parsePlaySPITObject(p_SPITMessage->getOPPartAs<SPIT_Message::PlaySPITObject>());
case Message::PlayObject::OPFLAG:
parsePlaySPITObject(p_SPITMessage->getAs<Message::PlayObject>());
break;
case SPIT_Message::PlaySPITEnd::OPFLAG:
parsePlaySPITEnd(p_SPITMessage->getOPPartAs<SPIT_Message::PlaySPITEnd>());
case Message::PlayEnd::OPFLAG:
parsePlaySPITEnd(p_SPITMessage->getAs<Message::PlayEnd>());
break;
case SPIT_Message::ReportPlayStatus::OPFLAG:
parseReportPlayStatus(p_SPITMessage->getOPPartAs<SPIT_Message::ReportPlayStatus>());
case Message::ReportPlayStatus::OPFLAG:
parseReportPlayStatus(p_SPITMessage->getAs<Message::ReportPlayStatus>());
break;
default:
ESP_LOGD(TAG, "SPIT_Client::parseSPIT_Message: Unknown Message");
@@ -437,7 +437,7 @@ bool SPIT_Client::connect(string p_ServerIP, string p_ServerPort, string p_Clien
m_StopReceiveSPITMessages = true;
return false;
}
SPIT_Message::Connect sMConnect(m_ComputerName, m_Name);
Message::Connect sMConnect(m_ComputerName, m_Name);
sMConnect.setLoginName(p_LoginName);
sMConnect.setLoginPassword(p_LoginPassword);
sMConnect.setServerIP(p_ServerIP);
@@ -483,7 +483,7 @@ void SPIT_Client::disconnectInternal(Connection p_Cause) {
case Connection::Lost:
break;
case Connection::None: {
SPIT_Message::Disconnect sMDisconnect;
Message::Disconnect sMDisconnect;
sendSPITMessage(sMDisconnect);
} break;
case Connection::NoneServer:
@@ -525,7 +525,7 @@ void SPIT_Client::disconnectInternal(Connection p_Cause) {
}
}
void SPIT_Client::parseConnectAnswer(SPIT_Message::ConnectAnswer &p_ConnectAnswer) {
void SPIT_Client::parseConnectAnswer(Message::ConnectAnswer &p_ConnectAnswer) {
if (p_ConnectAnswer.getClientID() != m_ID)
return;
@@ -555,7 +555,7 @@ void SPIT_Client::parseConnectAnswer(SPIT_Message::ConnectAnswer &p_ConnectAnswe
* The SPIT server was closed
* @param p_Disconnect
*/
void SPIT_Client::parseDisconnect(SPIT_Message::Disconnect &p_Disconnect) {
void SPIT_Client::parseDisconnect(Message::Disconnect &p_Disconnect) {
Connection intCauseDisconnect = Connection::NoneServer;
/*
function<void()> o_Callable = bind(&SPIT_Client::disconnectInternal, this, intCauseDisconnect);
@@ -572,9 +572,9 @@ void SPIT_Client::parseDisconnect(SPIT_Message::Disconnect &p_Disconnect) {
* This is used to check if the other side is still present.
* @param p_Watchdog
*/
void SPIT_Client::parseWatchdog(SPIT_Message::Watchdog &p_Watchdog) {
void SPIT_Client::parseWatchdog(Message::Watchdog &p_Watchdog) {
// ESP_LOGD(TAG, "parse Watchdog ");
SPIT_Message::WatchdogAnswer o_WatchdogAnswer;
Message::WatchdogAnswer o_WatchdogAnswer;
sendSPITMessage(o_WatchdogAnswer);
}
/**
@@ -583,12 +583,12 @@ void SPIT_Client::parseWatchdog(SPIT_Message::Watchdog &p_Watchdog) {
* This is used to check if the other side is still present.
* @param p_Watchdog
*/
void SPIT_Client::parseWatchdogAnswer(SPIT_Message::WatchdogAnswer &p_WatchdogAnswer) {
void SPIT_Client::parseWatchdogAnswer(Message::WatchdogAnswer &p_WatchdogAnswer) {
answerWatchdog(); // is also done by parseSPIT_Message
}
void SPIT_Client::sendWatchdog() {
int intResult;
SPIT_Message::Watchdog sMWatchdog;
Message::Watchdog sMWatchdog;
intResult = sendSPITMessage(sMWatchdog);
if (intResult < 0) {
ESP_LOGW("WDT", "Failed to send Watchdog msg");
@@ -603,8 +603,8 @@ void SPIT_Client::eventWatchdogLost() {
}
//----- SPIT Project ------
void SPIT_Client::parseReportSPITProject(SPIT_Message::ReportSPITProject &p_ReportSPITProject) {
ESP_LOGD(TAG, "parse ReportSPITProject");
void SPIT_Client::parseReportSPITProject(Message::ReportProject &p_ReportSPITProject) {
ESP_LOGD(TAG, "parse ReportProject");
m_ServerProjectID = p_ReportSPITProject.getProjectID();
m_ServerProjectName = p_ReportSPITProject.getProjectName();
m_ServerFramesPerSecond = p_ReportSPITProject.getFramesPerSecond();
@@ -615,21 +615,21 @@ void SPIT_Client::parseReportSPITProject(SPIT_Message::ReportSPITProject &p_Repo
SPITObject::setConfirmedFalse(mSpitObjects);
// Send RequestProjectTransfer
SPIT_Message::RequestProjectTransfer sMRequestProjectTransfer;
Message::RequestProjectTransfer sMRequestProjectTransfer;
if (sendSPITMessage(sMRequestProjectTransfer) < 0) {
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send RequestProjectTransfer");
}
// todo Don't send the ReportSPITProject here it should be sended after parseEndProjectTransfer
// Send client's ReportSPITProject
SPIT_Message::ReportSPITProject reportSPITProject(m_ProjName, m_ProjName);
// todo Don't send the ReportProject here it should be sended after parseEndProjectTransfer
// Send client's ReportProject
Message::ReportProject reportSPITProject(m_ProjName, m_ProjName);
reportSPITProject.setFramesPerSecond(0);
if (sendSPITMessage(reportSPITProject) < 0) {
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send Client's ReportSPITProject");
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send Client's ReportProject");
}
}
void SPIT_Client::parseCloseSPITProject(SPIT_Message::CloseSPITProject &p_CloseSPITProject) {
ESP_LOGD(TAG, "parse CloseSPITProject");
void SPIT_Client::parseCloseSPITProject(Message::CloseProject &p_CloseSPITProject) {
ESP_LOGD(TAG, "parse CloseProject");
string stringProjectID;
mCallbacks.onProjectUpdate(ProjUpdate::ServerClosed, p_CloseSPITProject.getProjectID());
SPITPlayer::clearPlayers();
@@ -639,10 +639,10 @@ string SPIT_Client::getServerProjectID() { return m_ServerProjectID; }
string SPIT_Client::getServerProjectName() { return m_ServerProjectName; }
int SPIT_Client::getServerFramesPerSecond() { return m_ServerFramesPerSecond; }
void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransfer &p_RequestProjectTransfer) {
void SPIT_Client::parseRequestProjectTransfer(Message::RequestProjectTransfer &p_RequestProjectTransfer) {
ESP_LOGD(TAG, "parse RequestProjectTransfer");
// StartProjectTransfer
SPIT_Message::StartProjectTransfer sMStartProjectTransfer;
Message::StartProjectTransfer sMStartProjectTransfer;
if (sendSPITMessage(sMStartProjectTransfer) < 0) {
return;
}
@@ -667,19 +667,19 @@ void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransf
}
// EndProjectTransfer
SPIT_Message::EndProjectTransfer sMEndProjectTransfer;
Message::EndProjectTransfer sMEndProjectTransfer;
sendSPITMessage(sMEndProjectTransfer);
}
/* NEW IMPLEMENTATION
void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransfer* p_RequestProjectTransfer) {
void SPIT_Client::parseRequestProjectTransfer(Message::RequestProjectTransfer* p_RequestProjectTransfer) {
// ESP_LOGD(TAG, "parse RequestProjectTransfer");
thread* o_ThreadSend;
o_ThreadSend = new thread(&this->sendProject, this);
// int intResult;
// SPIT_Message::StartProjectTransfer* ptrSMStartProjectTransfer;
// SPIT_Message::EndProjectTransfer* ptrSMEndProjectTransfer;
// Message::StartProjectTransfer* ptrSMStartProjectTransfer;
// Message::EndProjectTransfer* ptrSMEndProjectTransfer;
// int intCount;
// SPITType* ptrSPITType;
// SPITObject* ptrSPITObject;
@@ -689,7 +689,7 @@ void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransf
// NotifyStartProjectTransfer_Client* o_RunnableStart = new NotifyStartProjectTransfer_Client(m_SPITClientInterface);
// SPIT_Handler::addRunnable(o_RunnableStart);
// ptrSMStartProjectTransfer = new SPIT_Message::StartProjectTransfer();
// ptrSMStartProjectTransfer = new Message::StartProjectTransfer();
// intResult = sendSPITMessage(ptrSMStartProjectTransfer);
// if (intResult < 0) {
// return;
@@ -723,7 +723,7 @@ void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransf
// }
// //EndProjectTransfer
// ptrSMEndProjectTransfer = new SPIT_Message::EndProjectTransfer();
// ptrSMEndProjectTransfer = new Message::EndProjectTransfer();
// intResult = sendSPITMessage(ptrSMEndProjectTransfer);
// if (intResult < 0) {
// return;
@@ -738,8 +738,8 @@ void SPIT_Client::parseRequestProjectTransfer(SPIT_Message::RequestProjectTransf
void SPIT_Client::sendProject(SPIT_Client *p_PtrSPIT_Client) {
// int intResult;
// SPIT_Message::StartProjectTransfer* ptrSMStartProjectTransfer;
// SPIT_Message::EndProjectTransfer* ptrSMEndProjectTransfer;
// Message::StartProjectTransfer* ptrSMStartProjectTransfer;
// Message::EndProjectTransfer* ptrSMEndProjectTransfer;
// int intCount;
// SPITType* ptrSPITType;
// SPITObject* ptrSPITObject;
@@ -748,7 +748,7 @@ void SPIT_Client::sendProject(SPIT_Client *p_PtrSPIT_Client) {
// NotifyStartProjectTransfer_Client* o_RunnableStart = new NotifyStartProjectTransfer_Client(p_PtrSPIT_Client->getSPITClientInterface());
// SPIT_Handler::addRunnable(o_RunnableStart);
// ptrSMStartProjectTransfer = new SPIT_Message::StartProjectTransfer();
// ptrSMStartProjectTransfer = new Message::StartProjectTransfer();
// intResult = p_PtrSPIT_Client->sendSPITMessage(ptrSMStartProjectTransfer);
// if (intResult < 0) {
// return;
@@ -785,7 +785,7 @@ void SPIT_Client::sendProject(SPIT_Client *p_PtrSPIT_Client) {
// // }
// //EndProjectTransfer
// ptrSMEndProjectTransfer = new SPIT_Message::EndProjectTransfer();
// ptrSMEndProjectTransfer = new Message::EndProjectTransfer();
// intResult = p_PtrSPIT_Client->sendSPITMessage(ptrSMEndProjectTransfer);
// if (intResult < 0) {
// return;
@@ -797,24 +797,24 @@ void SPIT_Client::sendProject(SPIT_Client *p_PtrSPIT_Client) {
// //Send act
}
void SPIT_Client::parseStartProjectTransfer(SPIT_Message::StartProjectTransfer &p_StartProjectTransfer) {
void SPIT_Client::parseStartProjectTransfer(Message::StartProjectTransfer &p_StartProjectTransfer) {
mCallbacks.onProjectUpdate(ProjUpdate::StartTransfer, m_ServerProjectID);
}
void SPIT_Client::parseEndProjectTransfer(SPIT_Message::EndProjectTransfer &p_EndProjectTransfer) {
void SPIT_Client::parseEndProjectTransfer(Message::EndProjectTransfer &p_EndProjectTransfer) {
SPITObject::clearUnconfirmedSPITObjects(mSpitObjects);
mCallbacks.onProjectUpdate(ProjUpdate::EndTransfer, m_ServerProjectID);
// Send SPIT_Message::ReportSPITProject after the m_SPITClientInterface is notfied of EndProjectTransfer
SPIT_Message::ReportSPITProject reportSPITProject(m_ProjName, m_ProjName);
// Send Message::ReportProject after the m_SPITClientInterface is notfied of EndProjectTransfer
Message::ReportProject reportSPITProject(m_ProjName, m_ProjName);
reportSPITProject.setFramesPerSecond(0);
if (sendSPITMessage(reportSPITProject) < 0) {
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send Client's ReportSPITProject");
ESP_LOGD(TAG, "SPIT_Client::parseReportSPITProject could not send Client's ReportProject");
}
}
//----- SPIT Types ------
void SPIT_Client::parseReportSPITType(SPIT_Message::ReportSPITType &p_ReportSPITType) {
ESP_LOGD(TAG, "parse ReportSPITType ID %s Name %s",p_ReportSPITType.getID().c_str(), p_ReportSPITType.getName().c_str());
void SPIT_Client::parseReportSPITType(Message::ReportType &p_ReportSPITType) {
ESP_LOGD(TAG, "parse ReportType ID %s Name %s",p_ReportSPITType.getID().c_str(), p_ReportSPITType.getName().c_str());
SPITType *ptrSPITType;
bool boolNew = false;
bool boolChanged = false;
@@ -863,8 +863,8 @@ void SPIT_Client::parseReportSPITType(SPIT_Message::ReportSPITType &p_ReportSPIT
}
}
}
void SPIT_Client::parseRemoveSPITType(SPIT_Message::RemoveSPITType &p_RemoveSPITType) {
ESP_LOGD(TAG, "parse RemoveSPITType %s", p_RemoveSPITType.getID().c_str());
void SPIT_Client::parseRemoveSPITType(Message::RemoveType &p_RemoveSPITType) {
ESP_LOGD(TAG, "parse RemoveType %s", p_RemoveSPITType.getID().c_str());
bool boolRemote = false;
string stringSPITTypeID = p_RemoveSPITType.getID();
@@ -903,7 +903,7 @@ void SPIT_Client::parseRemoveSPITType(SPIT_Message::RemoveSPITType &p_RemoveSPIT
* @return 0 = is sended, -1 = is not sended
*/
int SPIT_Client::sendSPITTypeInternal(SPITType &p_SPITType) {
SPIT_Message::ReportSPITType sMReportSPITType;
Message::ReportType sMReportSPITType;
p_SPITType.fillMessageOP(sMReportSPITType);
return sendSPITMessage(sMReportSPITType);
}
@@ -949,7 +949,7 @@ int SPIT_Client::removeSPITType(string p_SPITTypeID) {
ptrSPITType = mSpitTypes.getEntry(p_SPITTypeID);
if (ptrSPITType == nullptr)
return -1;
SPIT_Message::RemoveSPITType sMRemoveSPITType;
Message::RemoveType sMRemoveSPITType;
ptrSPITType->fillMessageOP(sMRemoveSPITType);
mCallbacks.onSpitType(ObjectEvent::Deleted, false, *ptrSPITType);
mSpitTypes.removeEntry(*ptrSPITType);
@@ -988,15 +988,15 @@ 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", p_ReportSPITObject.getID().c_str());
void SPIT_Client::parseReportSPITObject(Message::ReportObject &p_ReportSPITObject) {
ESP_LOGD(TAG, "parse ReportObject %s", p_ReportSPITObject.getID().c_str());
SPITObject *ptrSPITObject;
SPITType *ptrSPITType;
bool boolNew = false;
bool boolRemote = false;
bool boolChanged = false;
{
ESP_LOGD(TAG, "parse ReportSPITObject %s / %s", p_ReportSPITObject.getID().c_str(), p_ReportSPITObject.getName().c_str());
ESP_LOGD(TAG, "parse ReportObject %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());
@@ -1068,8 +1068,8 @@ void SPIT_Client::parseReportSPITObject(SPIT_Message::ReportSPITObject &p_Report
}
}
}
void SPIT_Client::parseRemoveSPITObject(SPIT_Message::RemoveSPITObject &p_RemoveSPITObject) {
ESP_LOGD(TAG, "parse RemoveSPITObject %s", p_RemoveSPITObject.getID().c_str());
void SPIT_Client::parseRemoveSPITObject(Message::RemoveObject &p_RemoveSPITObject) {
ESP_LOGD(TAG, "parse RemoveObject %s", p_RemoveSPITObject.getID().c_str());
SPITObject *ptrSPITObject = mRemoteSpitObjects.getEntry(p_RemoveSPITObject.getID());
if (ptrSPITObject != nullptr) {
SPITType *ptrSPITType = mRemoteSpitTypes.getEntry(ptrSPITObject->getSPITTypeID());
@@ -1086,7 +1086,7 @@ void SPIT_Client::parseRemoveSPITObject(SPIT_Message::RemoveSPITObject &p_Remove
int SPIT_Client::sendSPITObjectInternal(SPITObject *ptrSPITObject) {
if (ptrSPITObject == nullptr)
return -1;
SPIT_Message::ReportSPITObject sMReportSPITObject;
Message::ReportObject sMReportSPITObject;
ptrSPITObject->fillMessageOP(sMReportSPITObject);
return sendSPITMessage(sMReportSPITObject);
@@ -1150,7 +1150,7 @@ int SPIT_Client::removeSPITObject(string p_SPITObjectID) {
SPITType *ptrSPITType;
SPITObject *ptrSPITObject;
{
SPIT_Message::RemoveSPITObject sMRemoveSPITObject;
Message::RemoveObject sMRemoveSPITObject;
ptrSPITObject = mSpitObjects.getEntry(p_SPITObjectID);
if (ptrSPITObject == nullptr)
@@ -1168,8 +1168,8 @@ int SPIT_Client::removeSPITObject(string p_SPITObjectID) {
//----- Play SPIT Objects ------
void SPIT_Client::parsePlaySPITStart(SPIT_Message::PlaySPITStart &p_PlaySPITStart) {
ESP_LOGD(TAG, "parse PlaySPITStart ID: %s Name: %s Running: %d", p_PlaySPITStart.getPlayerID().c_str(), p_PlaySPITStart.getPlayerName().c_str(), (int)p_PlaySPITStart.getPlayerIsRunning());
void SPIT_Client::parsePlaySPITStart(Message::PlayStart &p_PlaySPITStart) {
ESP_LOGD(TAG, "parse PlayStart ID: %s Name: %s Running: %d", p_PlaySPITStart.getPlayerID().c_str(), p_PlaySPITStart.getPlayerName().c_str(), (int)p_PlaySPITStart.getPlayerIsRunning());
SPITPlayer &spitPlayer = SPITPlayer::getSPITPlayer(p_PlaySPITStart.getPlayerID());
spitPlayer.setIsRunning(p_PlaySPITStart.getPlayerIsRunning());
spitPlayer.setName(p_PlaySPITStart.getPlayerName());
@@ -1179,7 +1179,7 @@ void SPIT_Client::parsePlaySPITStart(SPIT_Message::PlaySPITStart &p_PlaySPITStar
mCallbacks.onPlay(spitPlayer.getID(), spitPlayer.getName(), spitPlayer.getType(), spitPlayer.getIsRunning(), spitPlayer.getTime());
}
void SPIT_Client::parsePlaySPITObject(SPIT_Message::PlaySPITObject &p_PlaySPITObject) {
void SPIT_Client::parsePlaySPITObject(Message::PlayObject &p_PlaySPITObject) {
SPITPlayer &ptrSPITPlayer = SPITPlayer::getSPITPlayer(p_PlaySPITObject.getPlayerID());
SPITObject *ptrSPITObject = mSpitObjects.getEntry(p_PlaySPITObject.getSPITObjectID());
@@ -1195,7 +1195,7 @@ void SPIT_Client::parsePlaySPITObject(SPIT_Message::PlaySPITObject &p_PlaySPITOb
ptrPlaySPITType->addValue(((double)p_PlaySPITObject.getValue() / 1000000), ((double)ptrSPITObject->getValueFactor() / 1000000));
}
void SPIT_Client::parsePlaySPITEnd(SPIT_Message::PlaySPITEnd &p_PlaySPITEnd) {
void SPIT_Client::parsePlaySPITEnd(Message::PlayEnd &p_PlaySPITEnd) {
SPITPlayer &ptrSPITPlayer = SPITPlayer::getSPITPlayer(p_PlaySPITEnd.getPlayerID());
auto &ptrPlaySPITTypes = ptrSPITPlayer.getPlaySPITTypes();
@@ -1214,7 +1214,7 @@ void SPIT_Client::parsePlaySPITEnd(SPIT_Message::PlaySPITEnd &p_PlaySPITEnd) {
ptrSPITPlayer.endPlaySequence();
}
void SPIT_Client::parseReportPlayStatus(SPIT_Message::ReportPlayStatus &p_ReportPlayStatus) {
void SPIT_Client::parseReportPlayStatus(Message::ReportPlayStatus &p_ReportPlayStatus) {
SPITType *ptrSPITType = NULL;
SPITObject *ptrSPITObject = mRemoteSpitObjects.getEntry(p_ReportPlayStatus.getID());
@@ -1257,12 +1257,12 @@ void SPIT_Client::sendRemoteObject(string p_SPITObjectID, int p_Valueppm, char p
if (ptrRemoteSPITObject == nullptr)
return;
SPIT_Message::PlaySPITStart playSPITStart(m_ID, m_ProjName, PLAYERTYPE_DISCRETE);
Message::PlayStart playSPITStart(m_ID, m_ProjName, PLAYERTYPE_DISCRETE);
playSPITStart.setPlayerIsRunning(false);
playSPITStart.setTime(0);
sendSPITMessage(playSPITStart);
SPIT_Message::PlaySPITObject playSPITObject;
Message::PlayObject playSPITObject;
playSPITObject.setID(ptrRemoteSPITObject->getID());
playSPITObject.setPlayPrePosition(false);
playSPITObject.setPlayerID(m_ID);
@@ -1270,7 +1270,7 @@ void SPIT_Client::sendRemoteObject(string p_SPITObjectID, int p_Valueppm, char p
playSPITObject.setValueFlag(p_ValueFlag);
sendSPITMessage(playSPITObject);
SPIT_Message::PlaySPITEnd playSPITEnd(m_ID);
Message::PlayEnd playSPITEnd(m_ID);
sendSPITMessage(playSPITEnd);
}
components/spit/src/SPIT_Message.cpp
-1352
View File
File diff suppressed because it is too large Load Diff
components/spit/src/spit_message.cpp
+1349
View File
File diff suppressed because it is too large Load Diff