Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-25 00:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev-225-flush-and-clear' into dev-227-marlin-compat

Browse Source
This commit is contained in:
Rob Giseburt
2017-01-10 16:59:19 -06:00
parent 646f158f9b c5792c2d49
commit d250618911
4 changed files with 110 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/canonical_machine.cpp
+1
View File
@@ -823,6 +823,7 @@ void cm_clear()
{
if (cm.machine_state == MACHINE_ALARM) {
cm.machine_state = MACHINE_PROGRAM_STOP;
xio_flush_to_command();
} else if (cm.machine_state == MACHINE_SHUTDOWN) {
cm.machine_state = MACHINE_READY;
}
g2core/controller.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ static void _dispatch_kernel(const devflags_t flags)
// trap single character commands
if (*cs.bufp == '!') { cm_request_feedhold(); }
else if (*cs.bufp == '%') { cm_request_queue_flush(); }
else if (*cs.bufp == '%') { cm_request_queue_flush(); xio_flush_to_command(); }
else if (*cs.bufp == '~') { cm_request_end_hold(); }
else if (*cs.bufp == EOT) { cm_alarm(STAT_KILL_JOB, "EOT Received"); }
else if (*cs.bufp == ENQ) { controller_request_enquiry(); }
g2core/xio.cpp
+107 -31
View File
@@ -169,6 +169,7 @@ struct xioDeviceWrapperBase { // C++ base class for device primit
virtual int16_t readchar() { return -1; };
virtual void flush() {};
virtual void flushRead() {}; // This should call _flushLine() before flushing the device.
virtual bool flushToCommand() { return false; };
virtual int16_t write(const char *buffer, int16_t len) { return -1; };
virtual char *readline(devflags_t limit_flags, uint16_t &size) { return nullptr; };
@@ -313,6 +314,21 @@ struct xio_t {
}
}
/*
* flushToCommand() - flush all readable devices' read buffers up to the last returned command
*
* Note that only one device will flush.
*
*/
void flushToCommand()
{
for (int8_t i = 0; i < _dev_count; ++i) {
if (DeviceWrappers[i]->flushToCommand()) {
return; // we only care to flush the one that last returned a control.
}
}
}
/*
* readline() - read a complete line from a device
*
@@ -429,6 +445,8 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
volatile uint16_t _last_scan_offset; // DEBUGGING
bool _last_returned_a_control = false;
LineRXBuffer(owner_type owner) : parent_type{owner} {};
void init() {
@@ -677,6 +695,8 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
_restartTransfer();
_last_returned_a_control = found_control;
char *dst_ptr = _line_buffer;
line_size = 0;
@@ -728,33 +748,34 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
if (ctrl_is_at_beginning_of_data) {
_read_offset = _scan_offset;
} else {
// special case: if the return value is '%'
// then we actually consider everything before it to be read
if ('%' == _line_buffer[0]) {
// Things that must be managed here:
// * _read_offset -- we're skipping data
// * _lines_found -- we shouldn't have any lines "left"
// * _skip_sections -- there's nothing to skip, we just did
// Things that won't be changed (further):
// * _scan_offset -- we're not changing past where it's scanned
// * _line_start_offset -- we've already adjusted it
// * _at_start_of_line -- should always be true when we're here
// move the read buffer up to where we're scanning
_read_offset = _scan_offset;
// record that we have 0 lines (of data) in the buffer
_lines_found = 0;
// and clear out any skip sections we have
while (!_skip_sections.is_empty()) {
_skip_sections.pop_skip();
}
}
}
// else {
// // special case: if the return value is '%'
// // then we actually consider everything before it to be read
//
// if ('%' == _line_buffer[0]) {
// // Things that must be managed here:
// // * _read_offset -- we're skipping data
// // * _lines_found -- we shouldn't have any lines "left"
// // * _skip_sections -- there's nothing to skip, we just did
//
// // Things that won't be changed (further):
// // * _scan_offset -- we're not changing past where it's scanned
// // * _line_start_offset -- we've already adjusted it
// // * _at_start_of_line -- should always be true when we're here
//
// // move the read buffer up to where we're scanning
// _read_offset = _scan_offset;
//
// // record that we have 0 lines (of data) in the buffer
// _lines_found = 0;
//
// // and clear out any skip sections we have
// while (!_skip_sections.is_empty()) {
// _skip_sections.pop_skip();
// }
// }
// }
// if (ctrl_is_at_beginning_of_data) {
// // attempt to request more data
@@ -830,6 +851,7 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
return _line_buffer;
}; // readline
// this is called from flushRead()
void flush() {
parent_type::flush();
@@ -848,6 +870,41 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
}
}; // flush
bool flushToCommand() {
if (!_last_returned_a_control) {
return false;
}
// Things that must be managed here:
// * _read_offset -- we're skipping data
// * _lines_found -- we shouldn't have any lines "left"
// * _skip_sections -- there's nothing to skip, we just did
// Things that won't be changed (further):
// * _scan_offset -- we're not changing past where it's scanned
// * _line_start_offset -- we've already adjusted it
// * _at_start_of_line -- should always be true when we're here
// Note that we DO NOT call parent::flush() here. That will toss data
// we haven't scanned yet, beyond where we got the command we want to
// flush to.
// move the read buffer up to where we ended scanning
_read_offset = _scan_offset;
// record that we have 0 lines (of data) in the buffer
_lines_found = 0;
// and clear out any skip sections we have
while (!_skip_sections.is_empty()) {
_skip_sections.pop_skip();
}
_last_returned_a_control = false;
return true;
}; // flush
}; // LineRXBuffer
/* xioDeviceWrapper<typename Device>
@@ -893,13 +950,21 @@ struct xioDeviceWrapper : xioDeviceWrapperBase { // describes a device for re
return _dev->flush();
}
virtual void flushRead() final {
void flushRead() final {
// Flush out any partially or wholly read lines being stored:
_rx_buffer.flush();
_flushLine();
return _dev->flushRead();
}
void _flushLine() {
// TODO: Call to flush the RX buffer line structures
};
bool flushToCommand() final {
return _rx_buffer.flushToCommand();
}
virtual int16_t write(const char *buffer, int16_t len) final {
if (!isConnected()) {
return -1;
@@ -916,10 +981,6 @@ struct xioDeviceWrapper : xioDeviceWrapperBase { // describes a device for re
return NULL;
};
void _flushLine() {
// TODO: Call to flush the RX buffer line structures
};
void connectedStateChanged(bool connected) {
if (connected) {
if (isNotConnected()) {
@@ -1203,15 +1264,30 @@ int16_t xio_writeline(const char *buffer, bool only_to_muted /*= false*/)
return xio.writeline(buffer, only_to_muted);
}
/*
* write() - return true of the device is currently "connected" (there's a fair bit of interpretation)
*/
bool xio_connected()
{
return xio.connected();
}
/*
* xio_send_file() - send the contents of a xio_flash_file - returns false if there's already one sending
*/
bool xio_send_file(xio_flash_file &file) {
return flashFileWrapper.sendFile(file);
}
/*
* xio_flush_to_command() - clear the last read channel up until the command that was read
*/
void xio_flush_to_command() {
return xio.flushToCommand();
}
/***********************************************************************************
* newlib-nano support functions
g2core/xio.h
+1
View File
@@ -121,6 +121,7 @@ size_t xio_write(const char *buffer, size_t size, bool only_to_muted = false);
char *xio_readline(devflags_t &flags, uint16_t &size);
int16_t xio_writeline(const char *buffer, bool only_to_muted = false);
bool xio_connected();
void xio_flush_to_command();
stat_t xio_set_spi(nvObj_t *nv);