Skip to content

changed InputBuffer #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lwfl1111 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changed InputBuffer #1696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 53 additions & 47 deletions Grbl_Esp32/src/WebUI/InputBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,26 @@
#include "../Config.h"
#include "InputBuffer.h"

namespace WebUI {
namespace WebUI
{
InputBuffer inputBuffer;

InputBuffer::InputBuffer() {
InputBuffer::InputBuffer()
{
_RXbufferSize = 0;
_RXbufferpos = 0;
_RXbufferpos = 0;
}

void InputBuffer::begin() {
void InputBuffer::begin()
{
_RXbufferSize = 0;
_RXbufferpos = 0;
_RXbufferpos = 0;
}

void InputBuffer::end() {
void InputBuffer::end()
{
_RXbufferSize = 0;
_RXbufferpos = 0;
_RXbufferpos = 0;
}

InputBuffer::operator bool() const { return true; }
Expand All @@ -45,78 +49,80 @@ namespace WebUI {

int InputBuffer::availableforwrite() { return RXBUFFERSIZE - _RXbufferSize; }

size_t InputBuffer::write(uint8_t c) {
if ((1 + _RXbufferSize) <= RXBUFFERSIZE) {
int current = _RXbufferpos + _RXbufferSize;
if (current > RXBUFFERSIZE) {
current = current - RXBUFFERSIZE;
}
if (current > (RXBUFFERSIZE - 1)) {
current = 0;
}
size_t InputBuffer::write(uint8_t c)
{
if ((1 + _RXbufferSize) <= RXBUFFERSIZE)
{
// 使用模运算简化循环缓冲区索引计算
int current = (_RXbufferpos + _RXbufferSize) % RXBUFFERSIZE;
_RXbuffer[current] = c;
current++;
_RXbufferSize += 1;
return 1;
}
return 0;
}

size_t InputBuffer::write(const uint8_t* buffer, size_t size) {
//No need currently
//keep for compatibility
size_t InputBuffer::write(const uint8_t *buffer, size_t size)
{
// No need currently
// keep for compatibility
return size;
}

int InputBuffer::peek(void) {
if (_RXbufferSize > 0) {
int InputBuffer::peek(void)
{
if (_RXbufferSize > 0)
{
return _RXbuffer[_RXbufferpos];
} else {
}
else
{
return -1;
}
}

bool InputBuffer::push(const char* data) {
bool InputBuffer::push(const char *data)
{
int data_size = strlen(data);
if ((data_size + _RXbufferSize) <= RXBUFFERSIZE) {
int current = _RXbufferpos + _RXbufferSize;
if (current > RXBUFFERSIZE) {
current = current - RXBUFFERSIZE;
}
for (int i = 0; i < data_size; i++) {
if (current > (RXBUFFERSIZE - 1)) {
current = 0;
}
if ((data_size + _RXbufferSize) <= RXBUFFERSIZE)
{
for (int i = 0; i < data_size; i++)
{
// 使用模运算简化循环缓冲区索引计算
int current = (_RXbufferpos + _RXbufferSize + i) % RXBUFFERSIZE;
_RXbuffer[current] = data[i];
current++;
}
_RXbufferSize += strlen(data);
_RXbufferSize += data_size; // 避免重复调用strlen
return true;
}
return false;
}

int InputBuffer::read(void) {
if (_RXbufferSize > 0) {
int InputBuffer::read(void)
{
if (_RXbufferSize > 0)
{
int v = _RXbuffer[_RXbufferpos];
_RXbufferpos++;
if (_RXbufferpos > (RXBUFFERSIZE - 1)) {
_RXbufferpos = 0;
}
// 使用模运算简化循环缓冲区索引计算
_RXbufferpos = (_RXbufferpos + 1) % RXBUFFERSIZE;
_RXbufferSize--;
return v;
} else {
}
else
{
return -1;
}
}

void InputBuffer::flush(void) {
//No need currently
//keep for compatibility
void InputBuffer::flush(void)
{
// No need currently
// keep for compatibility
}

InputBuffer::~InputBuffer() {
InputBuffer::~InputBuffer()
{
_RXbufferSize = 0;
_RXbufferpos = 0;
_RXbufferpos = 0;
}
}