Skip to content
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

Fix recommended by rob. Change to one port #231

Merged
merged 1 commit into from
Jan 17, 2017
Merged

Fix recommended by rob. Change to one port #231

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion g2core/settings/settings_shopbot_sbv300.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

// Communications and reporting settings

#define USB_SERIAL_PORTS_EXPOSED 2 // Valid options are 1 or 2, only!
#define USB_SERIAL_PORTS_EXPOSED 1 // Valid options are 1 or 2, only!

#define COMM_MODE JSON_MODE // one of: TEXT_MODE, JSON_MODE
#define XIO_ENABLE_FLOW_CONTROL FLOW_CONTROL_RTS // FLOW_CONTROL_OFF, FLOW_CONTROL_RTS
Expand Down
8 changes: 5 additions & 3 deletions g2core/xio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,11 @@ struct xio_t {
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.
}
DeviceWrappers[i]->flushToCommand();
//if (DeviceWrappers[i]->flushToCommand()) {
// return; // we only care to flush the one that last returned a control.
//}

}
}

Expand Down