Skip to content

Fix: Since we use all available pins for RS485 communication there is no reason to check if all pins have been correctly configured. #89

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

Merged
merged 2 commits into from
Aug 26, 2022
Merged

Fix: Since we use all available pins for RS485 communication there is no reason to check if all pins have been correctly configured. #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da6211
Fix: Since we use all available pins for RS485 communication there is…
aentinger Aug 26, 2022
8159bce
Delete setPins-API. It's not needed.
aentinger Aug 26, 2022
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
51 changes: 14 additions & 37 deletions src/lib/motors/RS485.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,11 @@ void RS485Class::begin(unsigned long baudrate, uint16_t config, int predelay, in
_predelay = predelay;
_postdelay = postdelay;

if (_dePin > -1) {
pinMode(_dePin, OUTPUT);
digitalWrite(_dePin, LOW);
}
pinMode(_dePin, OUTPUT);
digitalWrite(_dePin, LOW);

if (_rePin > -1) {
pinMode(_rePin, OUTPUT);
digitalWrite(_rePin, HIGH);
}
pinMode(_rePin, OUTPUT);
digitalWrite(_rePin, HIGH);

_transmisionBegun = false;

Expand All @@ -70,15 +66,11 @@ void RS485Class::end()
{
_serial->end();

if (_rePin > -1) {
digitalWrite(_rePin, LOW);
pinMode(_dePin, INPUT);
}
digitalWrite(_rePin, LOW);
pinMode(_dePin, INPUT);

if (_dePin > -1) {
digitalWrite(_dePin, LOW);
pinMode(_rePin, INPUT);
}
digitalWrite(_dePin, LOW);
pinMode(_rePin, INPUT);
}

int RS485Class::available()
Expand Down Expand Up @@ -118,10 +110,8 @@ RS485Class::operator bool()

void RS485Class::beginTransmission()
{
if (_dePin > -1) {
digitalWrite(_dePin, HIGH);
if (_predelay) delayMicroseconds(_predelay);
}
digitalWrite(_dePin, HIGH);
if (_predelay) delayMicroseconds(_predelay);

_transmisionBegun = true;
}
Expand All @@ -130,26 +120,20 @@ void RS485Class::endTransmission()
{
_serial->flush();

if (_dePin > -1) {
if (_postdelay) delayMicroseconds(_postdelay);
digitalWrite(_dePin, LOW);
}
if (_postdelay) delayMicroseconds(_postdelay);
digitalWrite(_dePin, LOW);

_transmisionBegun = false;
}

void RS485Class::receive()
{
if (_rePin > -1) {
digitalWrite(_rePin, LOW);
}
digitalWrite(_rePin, LOW);
}

void RS485Class::noReceive()
{
if (_rePin > -1) {
digitalWrite(_rePin, HIGH);
}
digitalWrite(_rePin, HIGH);
}

void RS485Class::sendBreak(unsigned int duration)
Expand All @@ -171,10 +155,3 @@ void RS485Class::sendBreakMicroseconds(unsigned int duration)
delayMicroseconds(duration);
_serial->begin(_baudrate, _config);
}

void RS485Class::setPins(int txPin, int dePin, int rePin)
{
_txPin = txPin;
_dePin = dePin;
_rePin = rePin;
}
2 changes: 0 additions & 2 deletions src/lib/motors/RS485.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ class RS485Class : public Stream {
void sendBreak(unsigned int duration);
void sendBreakMicroseconds(unsigned int duration);

void setPins(int txPin, int dePin, int rePin);

private:
HardwareSerial* _serial;
int _txPin;
Expand Down