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.

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

KISSCC: Fix soft serial on TLM pad #7149

Merged
merged 1 commit into from
Dec 27, 2018

Conversation

robertlacroix
Copy link
Contributor

Fixes #7147

Legal disclaimer: I am making my contributions/submissions to this project solely in my personal capacity and am not conveying any rights to any intellectual property of any third parties.

@@ -84,7 +84,7 @@
#define UART3_RX_PIN PB11 // PB11 (AF7)

#ifdef KISSCC
#define SOFTSERIAL1_TX_PIN PA13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of this can be simplified:

#define SOFTSERIAL1_TX_PIN      PA13 // KISSFC: AUX1, KISSCC: TLM
#if !defined(KISSCC)
#define SOFTSERIAL2_TX_PIN      PA15 // ROLL
#endif

@mikeller mikeller added this to the 3.5.4 milestone Dec 3, 2018
@@ -84,7 +84,7 @@
#define UART3_RX_PIN PB11 // PB11 (AF7)

#ifdef KISSCC
#define SOFTSERIAL1_TX_PIN PA13
#define SOFTSERIAL1_TX_PIN PA13 // TLM
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robertlacroix: Can you simplify this please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sorry busy the last couple of days. I’ll send an updated change soon

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikeller done

@mikeller mikeller modified the milestones: 3.5.4, 3.5.5 Dec 17, 2018
_Legal disclaimer: I am making my contributions/submissions to this project solely in my personal capacity and am not conveying any rights to any intellectual property of any third parties._
@mikeller mikeller merged commit dc8eafa into betaflight:master Dec 27, 2018
mikeller added a commit that referenced this pull request Dec 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants