GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-05 16:20:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update mks_service.cpp

Browse Source 
Fix compilation error Thanks to Epiphany for pointing out
This commit is contained in:
Luc 2022-04-12 12:40:56 +08:00
parent a4609aee69
commit b3f2e46b86
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
esp3d/src/modules/mks/mks_service.cpp
View File

@ -627,8 +627,8 @@ bool MKSService::sendNetworkFrame()
//Wifi_key Segment //Wifi_key Segment
strcpy((char *)&_frame[dataOffset], s.c_str()); strcpy((char *)&_frame[dataOffset], s.c_str());
dataOffset+=s.length(); dataOffset+=s.length();
} else if (NetConfig::getMode() == ESP_WIFI_AP || (NetConfig::getMode() == ESP_AP_SETUP) { } else if (NetConfig::getMode() == ESP_WIFI_AP || (NetConfig::getMode() == ESP_AP_SETUP)) {
log_esp3d("AP Mode"); log_esp3d("AP Mode");
/////////////////////////////////// ///////////////////////////////////
//IP Segment //IP Segment
//IP value //IP value
@ -671,61 +671,61 @@ bool MKSService::sendNetworkFrame()
//Cloud Services port Segment //Cloud Services port Segment
//hard coded //hard coded
_frame[MKS_FRAME_DATA_OFFSET +4] = (telnet_server.port()) & 0xff; _frame[MKS_FRAME_DATA_OFFSET +4] = (telnet_server.port()) & 0xff;
_frame[MKS_FRAME_DATA_OFFSET +5] = ((telnet_server.port()) >> 8 ) & 0xff; _frame[MKS_FRAME_DATA_OFFSET +5] = ((telnet_server.port()) >> 8 ) & 0xff;
log_esp3d("Cloud port: %d", (telnet_server.port())); log_esp3d("Cloud port: %d", (telnet_server.port()));
////////////////////////////////// //////////////////////////////////
//Cloud State Segment //Cloud State Segment
//hard coded as disabled in upstream FW //hard coded as disabled in upstream FW
_frame[dataOffset] = MKS_FRAME_CLOUD_DISABLED_STATE; _frame[dataOffset] = MKS_FRAME_CLOUD_DISABLED_STATE;
dataOffset++; dataOffset++;
////////////////////////////////// //////////////////////////////////
//Cloud host len Segment //Cloud host len Segment
//Use ESP3D IP instead //Use ESP3D IP instead
s = NetConfig::localIPAddress().toString(); s = NetConfig::localIPAddress().toString();
_frame[dataOffset] = s.length(); _frame[dataOffset] = s.length();
dataOffset++; dataOffset++;
////////////////////////////////// //////////////////////////////////
//Cloud host Segment //Cloud host Segment
//Use ESP3D IP instead //Use ESP3D IP instead
strcpy((char *)&_frame[dataOffset], s.c_str()); strcpy((char *)&_frame[dataOffset], s.c_str());
dataOffset+=s.length(); dataOffset+=s.length();
////////////////////////////////// //////////////////////////////////
//Cloud host port Segment //Cloud host port Segment
//use webserver port instead //use webserver port instead
_frame[dataOffset] = (HTTP_Server::port()) & 0xff; _frame[dataOffset] = (HTTP_Server::port()) & 0xff;
dataOffset++; dataOffset++;
_frame[dataOffset] = ((HTTP_Server::port())>> 8 ) & 0xff; _frame[dataOffset] = ((HTTP_Server::port())>> 8 ) & 0xff;
dataOffset++; dataOffset++;
////////////////////////////////// //////////////////////////////////
//Module id len Segment //Module id len Segment
//Use hostname instead //Use hostname instead
_frame[dataOffset] = strlen(_moduleId); _frame[dataOffset] = strlen(_moduleId);
dataOffset++; dataOffset++;
////////////////////////////////// //////////////////////////////////
//Module id Segment //Module id Segment
strcpy((char *)&_frame[dataOffset], _moduleId); strcpy((char *)&_frame[dataOffset], _moduleId);
dataOffset+=strlen(_moduleId); dataOffset+=strlen(_moduleId);
////////////////////////////////// //////////////////////////////////
//FW version len Segment //FW version len Segment
_frame[dataOffset] = strlen(FW_VERSION)+6; _frame[dataOffset] = strlen(FW_VERSION)+6;
dataOffset++; dataOffset++;
////////////////////////////////// //////////////////////////////////
//FW version Segment //FW version Segment
strcpy((char *)&_frame[dataOffset], "ESP3D_" FW_VERSION); strcpy((char *)&_frame[dataOffset], "ESP3D_" FW_VERSION);
dataOffset+=strlen(FW_VERSION)+6; dataOffset+=strlen(FW_VERSION)+6;
////////////////////////////////// //////////////////////////////////
//Tail Segment //Tail Segment
_frame[dataOffset] = MKS_FRAME_TAIL_FLAG; _frame[dataOffset] = MKS_FRAME_TAIL_FLAG;
////////////////////////////////// //////////////////////////////////
//Data len Segment //Data len Segment
//Calculated from above //Calculated from above
_frame[MKS_FRAME_DATALEN_OFFSET] = (dataOffset-4) & 0xff; _frame[MKS_FRAME_DATALEN_OFFSET] = (dataOffset-4) & 0xff;
_frame[MKS_FRAME_DATALEN_OFFSET+1] = ((dataOffset-4) >> 8) & 0xff; _frame[MKS_FRAME_DATALEN_OFFSET+1] = ((dataOffset-4) >> 8) & 0xff;
log_esp3d("Size of data in frame %d ", dataOffset-4); log_esp3d("Size of data in frame %d ", dataOffset-4);
if (canSendFrame()) { if (canSendFrame()) {
ESP3DOutput output(ESP_SERIAL_CLIENT); ESP3DOutput output(ESP_SERIAL_CLIENT);
if (output.write(_frame,dataOffset+1) == (dataOffset+1)) { if (output.write(_frame,dataOffset+1) == (dataOffset+1)) {
log_esp3d("Ok"); log_esp3d("Ok");
sendFrameDone(); sendFrameDone();