heliox/base-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add safe clearBuffer websocket method

Browse source
This commit is contained in:
GHOSCHT 2022-04-13 19:09:03 +02:00
parent 5c41e066e0
commit 35c41d131f
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Firmware/lib/WebsocketCommunicator/WebsocketCommunicator.cpp
View file

@ -22,7 +22,7 @@ WebsocketCommunicator::WebsocketCommunicator(AsyncWebSocket &socket, AsyncWebSer
break;
}
};
msgRead = false;
socket.onEvent(onEvent);
server.addHandler(&socket);
}
@ -41,11 +41,21 @@ void WebsocketCommunicator::sendMessage(const char message[])
char *WebsocketCommunicator::receiveMessage()
{
msgRead = true;
return getBuffer();
}
void WebsocketCommunicator::clearBufferSafely()
{
if (msgRead)
{
clearBuffer();
}
}
void WebsocketCommunicator::handleMessage(void *arg, uint8_t *data, size_t len)
{
msgRead = false;
int effectiveLen = len < bufferSize ? len : bufferSize;
strncpy(messageBuffer, (char *)data, effectiveLen);
}

2
Firmware/lib/WebsocketCommunicator/WebsocketCommunicator.h
View file

@ -5,6 +5,7 @@ class WebsocketCommunicator : public Communicator
{
private:
void handleMessage(void *arg, uint8_t *data, size_t len);
bool msgRead;
protected:
AsyncWebSocket &socket;
@ -15,4 +16,5 @@ public:
void sendMessage(int *values, __SIZE_TYPE__ numberOfValues) override;
void sendMessage(const char message[]) override;
char *receiveMessage() override;
void clearBufferSafely();
};

15
Firmware/src/main.cpp
View file

@ -20,7 +20,7 @@ AsyncWebSocket ws("/ws");
Communicator *computer;
Communicator *phone;
Communicator *websocket;
WebsocketCommunicator *websocket;
LightController *light;
void websocketTask(void *parameter)
@ -28,15 +28,13 @@ void websocketTask(void *parameter)
while (true)
{
websocket->sendMessage(light->getBjtState(), light->getBjtCount());
light->updateState(websocket->receiveMessage(), STEPS);
websocket->clearBuffer();
vTaskDelay(100 / portTICK_PERIOD_MS);
}
vTaskDelete(NULL);
}
void registerTasks()
void registerWebSocketTask()
{
xTaskCreate(websocketTask, "websocketTask", 10000, NULL, 1, NULL);
}
@ -79,7 +77,7 @@ void setup()
connectWifi(WIFI_TIMEOUT);
server.begin();
registerTasks();
registerWebSocketTask();
}
void computerCycle()
@ -96,9 +94,16 @@ void phoneCycle()
phone->clearBuffer();
}
void websocketCycle()
{
light->updateState(websocket->receiveMessage(), STEPS);
websocket->clearBufferSafely();
}
void loop()
{
computerCycle();
phoneCycle();
websocketCycle();
ws.cleanupClients();
}