Skip to content

Backports fixes #1 #9

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Backports fixes #1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2227f71
moved GPX module to open3dengineering
Sep 9, 2014
dbb9f92
fixed reset error on Marlin Firmwares + increased maxCheckTemperature…
Oct 5, 2014
dbeb732
branced out to keep local changes out of upstream version
Oct 5, 2014
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 src/drivers/MarlinDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MarlinDriver::MarlinDriver(Server& server, const std::string& serialPortPath, co
checkTemperatureInterval_(2000),
checkConnection_(true),
checkTemperatureAttempt_(0),
maxCheckTemperatureAttempts_(2) {
maxCheckTemperatureAttempts_(45) {

/*//temperature parsing tests
readCode(*new string("T:19.1 /0.0 B:0.0 /0.0 @:0 B@:0"));
Expand Down
8 changes: 0 additions & 8 deletions src/drivers/Serial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,6 @@ Serial::SET_SPEED_RESULT Serial::setSpeed(int speed) {
if (ioctl(portFd_, TCSETS2, &options) < 0) return SSR_IO_SET;
#endif

//toggle DTR
if (ioctl(portFd_, TIOCMGET, &modemBits) < 0) return SSR_IO_MGET;
modemBits |= TIOCM_DTR;
if (ioctl(portFd_, TIOCMSET, &modemBits) < 0) return SSR_IO_MSET1;
usleep(100 * 1000);
modemBits &=~TIOCM_DTR;
if (ioctl(portFd_, TIOCMSET, &modemBits) < 0) return SSR_IO_MSET2;

return SSR_OK;
}

Expand Down