From 0ccf2d0c334ef93354474f45929c33eeb06611b4 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 17 Jul 2020 22:10:53 -0500 Subject: [PATCH] Remove some debugging printouts in Network Client and Server code --- NetworkClient.cpp | 11 ----------- NetworkServer.cpp | 20 -------------------- RGBController/RGBController.cpp | 2 -- 3 files changed, 33 deletions(-) diff --git a/NetworkClient.cpp b/NetworkClient.cpp index 8b4e2f14..e59440e5 100644 --- a/NetworkClient.cpp +++ b/NetworkClient.cpp @@ -352,8 +352,6 @@ void NetworkClient::ListenThreadFunction() } while(bytes_read != sizeof(header) - sizeof(header.pkt_magic)); - //printf( "Client: Received header, now receiving data of size %d\r\n", header.pkt_size); - //Header received, now receive the data if(header.pkt_size > 0) { @@ -376,21 +374,14 @@ void NetworkClient::ListenThreadFunction() } while (bytes_read < header.pkt_size); } - //printf( "Client: Received header and data\r\n" ); - //printf( "Client: Packet ID: %d \r\n", header.pkt_id); - //Entire request received, select functionality based on request ID switch(header.pkt_id) { case NET_PACKET_ID_REQUEST_CONTROLLER_COUNT: - printf( "Client: NET_PACKET_ID_REQUEST_CONTROLLER_COUNT\r\n" ); - ProcessReply_ControllerCount(header.pkt_size, data); break; case NET_PACKET_ID_REQUEST_CONTROLLER_DATA: - printf( "Client: NET_PACKET_ID_REQUEST_CONTROLLER_DATA\r\n"); - ProcessReply_ControllerData(header.pkt_size, data, header.pkt_dev_idx); break; } @@ -453,8 +444,6 @@ void NetworkClient::ProcessReply_ControllerData(unsigned int data_size, char * d new_controller->ReadDeviceDescription((unsigned char *)data); - printf("Received controller: %s\r\n", new_controller->name.c_str()); - if(dev_idx >= server_controllers.size()) { server_controllers.push_back(new_controller); diff --git a/NetworkServer.cpp b/NetworkServer.cpp index 643655fb..25084a45 100644 --- a/NetworkServer.cpp +++ b/NetworkServer.cpp @@ -427,8 +427,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) } while(bytes_read != sizeof(header) - sizeof(header.pkt_magic)); - //printf( "Server: Received header, now receiving data of size %d\r\n", header.pkt_size); - //Header received, now receive the data if(header.pkt_size > 0) { @@ -451,30 +449,22 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) } while (bytes_read < header.pkt_size); } - //printf( "Server: Received header and data\r\n" ); - //printf( "Server: Packet ID: %d \r\n", header.pkt_id); - //Entire request received, select functionality based on request ID switch(header.pkt_id) { case NET_PACKET_ID_REQUEST_CONTROLLER_COUNT: - //printf( "NET_PACKET_ID_REQUEST_CONTROLLER_COUNT\r\n" ); SendReply_ControllerCount(client_sock); break; case NET_PACKET_ID_REQUEST_CONTROLLER_DATA: - //printf( "NET_PACKET_ID_REQUEST_CONTROLLER_DATA\r\n" ); SendReply_ControllerData(client_sock, header.pkt_dev_idx); break; case NET_PACKET_ID_SET_CLIENT_NAME: - printf( "NET_PACKET_ID_SET_CLIENT_NAME\r\n" ); ProcessRequest_ClientString(client_sock, header.pkt_size, data); break; case NET_PACKET_ID_RGBCONTROLLER_RESIZEZONE: - //printf( "NET_PACKET_ID_RGBCONTROLLER_RESIZEZONE\r\n" ); - if((header.pkt_dev_idx < controllers.size()) && (header.pkt_size == (2 * sizeof(int)))) { int zone; @@ -488,8 +478,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) break; case NET_PACKET_ID_RGBCONTROLLER_UPDATELEDS: - //printf( "NET_PACKET_ID_RGBCONTROLLER_UPDATELEDS\r\n" ); - if(header.pkt_dev_idx < controllers.size()) { controllers[header.pkt_dev_idx]->SetColorDescription((unsigned char *)data); @@ -498,8 +486,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) break; case NET_PACKET_ID_RGBCONTROLLER_UPDATEZONELEDS: - //printf( "NET_PACKET_ID_RGBCONTROLLER_UPDATEZONELEDS\r\n" ); - if(header.pkt_dev_idx < controllers.size()) { int zone; @@ -512,8 +498,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) break; case NET_PACKET_ID_RGBCONTROLLER_UPDATESINGLELED: - //printf( "NET_PACKET_ID_RGBCONTROLLER_UPDATESINGLELED\r\n" ); - if(header.pkt_dev_idx < controllers.size()) { int led; @@ -526,8 +510,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) break; case NET_PACKET_ID_RGBCONTROLLER_SETCUSTOMMODE: - //printf( "NET_PACKET_ID_RGBCONTROLLER_SETCUSTOMMODE\r\n" ); - if(header.pkt_dev_idx < controllers.size()) { controllers[header.pkt_dev_idx]->SetCustomMode(); @@ -535,8 +517,6 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info) break; case NET_PACKET_ID_RGBCONTROLLER_UPDATEMODE: - //printf( "NET_PACKET_ID_RGBCONTROLLER_UPDATEMODE\r\n" ); - if(header.pkt_dev_idx < controllers.size()) { controllers[header.pkt_dev_idx]->SetModeDescription((unsigned char *)data); diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp index 24f20ec8..b6f6b542 100644 --- a/RGBController/RGBController.cpp +++ b/RGBController/RGBController.cpp @@ -990,8 +990,6 @@ void RGBController::SetModeDescription(unsigned char* data_buf) new_mode->colors.push_back(new_color); } - - printf("read data ptr %d\r\n", data_ptr); } unsigned char * RGBController::GetColorDescription()