# HG changeset patch # User Michiel Broek # Date 1540589552 -7200 # Node ID 9e4cce24f6ff05b4b9beff2ee119b3dab2776536 # Parent 3fd5e0fc075f879279b8ef69083c256538812cf4 Removed some unused code from the vnc websocket connection diff -r 3fd5e0fc075f -r 9e4cce24f6ff components/vnc_server/vnc-server.c --- a/components/vnc_server/vnc-server.c Fri Oct 26 22:19:48 2018 +0200 +++ b/components/vnc_server/vnc-server.c Fri Oct 26 23:32:32 2018 +0200 @@ -1004,14 +1004,11 @@ */ void task_WS(void *pvParameter) { - int i, j, num_of_encodings, rest_time; + int i, j, num_of_encodings; uint16_t *ptr_to_uint16; struct strMessage _msg; - // Do pin/pong. - VNC_WS_run = true; - rest_time = 0; while (VNC_WS_run) { @@ -1021,12 +1018,10 @@ * a clean exit of this task. */ if (xQueueReceive(message_queue, &_msg, 5 / portTICK_PERIOD_MS) == pdTRUE) { -// dump_msg((char *)_msg.message, _msg.length, "pull"); switch (_msg.message[0]) { case SET_PIXEL_FORMAT: -// printf("SET_PIXEL_FORMAT\n"); /* Check total message length */ if (_msg.length >= 20) { /* Check pixel format is as expected */ @@ -1131,12 +1126,6 @@ break; } } - - if (encoding_type.corre) { - ESP_LOGI(TAG, "SetEncodings use CORRE"); - } else { - ESP_LOGI(TAG, "SetEncodings use RAW"); - } } break; @@ -1173,7 +1162,6 @@ VNC_pointer_button = _msg.message[1]; VNC_pointer_x = _msg.message[2]*255 + _msg.message[3]; VNC_pointer_y = _msg.message[4]*255 + _msg.message[5]; -// printf("POINTER_EVENT button=%02x x=%d y=%d\n", VNC_pointer_button, VNC_pointer_x, VNC_pointer_y); } _msg.length = 0; break; @@ -1185,15 +1173,6 @@ default: ESP_LOGI(TAG, "Unknown message %d from client", _msg.message[0]); } - rest_time = 0; - } else { - rest_time++; // Each 5 milliseconds - if (rest_time == 2000) { - // 10 seconds silence, send a PING - rest_time = 0; -// int rc = ws_server_ping(VNC_WS_num); -// ESP_LOGI(TAG, "Send PING to %d, rc=%d", VNC_WS_num, rc); - } } } diff -r 3fd5e0fc075f -r 9e4cce24f6ff main/task_http.c --- a/main/task_http.c Fri Oct 26 22:19:48 2018 +0200 +++ b/main/task_http.c Fri Oct 26 23:32:32 2018 +0200 @@ -215,12 +215,7 @@ void websockify_callback(uint8_t num, WEBSOCKET_TYPE_t type, char* msg, uint64_t len) { switch(type) { - case WEBSOCKET_CONNECT: - ESP_LOGI(TAG,"Websockify client %i connected!",num); - break; - case WEBSOCKET_DISCONNECT_EXTERNAL: - ESP_LOGI(TAG,"Websockify client %i sent a disconnect message",num); VncStopWS(num); break; @@ -234,22 +229,12 @@ VncStopWS(num); break; - case WEBSOCKET_TEXT: - ESP_LOGI(TAG,"Websockiify client %i sent text message of size %i:\n%s",num,(uint32_t)len,msg); - break; - case WEBSOCKET_BIN: VncGetWSmessage(msg, len); //dump_buf(msg, len); break; - case WEBSOCKET_PING: - ESP_LOGI(TAG,"client %i pinged us with message of size %i:\n%s",num,(uint32_t)len,msg); - break; - - case WEBSOCKET_PONG: - ESP_LOGI(TAG,"client %i responded to the ping",num); - break; + default: break; } }